]> mj.ucw.cz Git - osdd.git/commitdiff
Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/osdd
authorMartin Mares <mj@ucw.cz>
Thu, 20 Oct 2011 11:56:47 +0000 (13:56 +0200)
committerMartin Mares <mj@ucw.cz>
Thu, 20 Oct 2011 11:56:47 +0000 (13:56 +0200)

Trivial merge