From: Martin Mares 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;p=osdd.git Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/osdd --- 4e31475880ddb439d98bfdc53b9dfe8c342ba95f