From: Martin Mares Date: Wed, 18 Aug 2010 23:43:28 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/osdd X-Git-Tag: v1.1~5 X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=27e0118f90fbf4aa11c588cca83b412aac601f39;p=osdd.git Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/osdd --- 27e0118f90fbf4aa11c588cca83b412aac601f39