From: Martin Mares <mj@ucw.cz>
Date: Tue, 3 Jan 2012 19:57:28 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/ga
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=240021143c00623fc96b26c13cbf429e2331f766;p=ga.git

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

240021143c00623fc96b26c13cbf429e2331f766