]> mj.ucw.cz Git - osdd.git/commitdiff
Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/osdd master
authorMartin Mares <mj@ucw.cz>
Tue, 8 Oct 2013 14:39:30 +0000 (16:39 +0200)
committerMartin Mares <mj@ucw.cz>
Tue, 8 Oct 2013 14:39:30 +0000 (16:39 +0200)

Trivial merge