From: Martin Mares <mj@ucw.cz>
Date: Sat, 17 Oct 2009 15:41:31 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/ads2
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=7fa7e65ae070dd84d15f1a11f2b7ad05c4429687;p=ads2.git

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

7fa7e65ae070dd84d15f1a11f2b7ad05c4429687