From: Martin Mares <mj@ucw.cz>
Date: Thu, 20 Oct 2011 11:56:47 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/osdd
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=4e31475880ddb439d98bfdc53b9dfe8c342ba95f;hp=6ce4ce112262894dc3cc3e06aeb8c3c9bb26efff;p=osdd.git

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