From: Martin Mares <mj@ucw.cz>
Date: Thu, 24 Feb 2011 12:40:38 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/ads
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=93b6498f8603d6d9c5b1c17e66707c0fa959de3e;p=ads1.git

Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/ads
---

93b6498f8603d6d9c5b1c17e66707c0fa959de3e