From: Martin Mares Date: Tue, 8 Oct 2013 14:39:30 +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=refs%2Fheads%2Fmaster;hp=e86321d03eb795669378283dd15e9b5514d5760b;p=osdd.git Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/osdd ---