]> mj.ucw.cz Git - osdd.git/commitdiff
Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/osdd
authorMartin Mares <mj@ucw.cz>
Wed, 18 Aug 2010 23:43:28 +0000 (01:43 +0200)
committerMartin Mares <mj@ucw.cz>
Wed, 18 Aug 2010 23:43:28 +0000 (01:43 +0200)

Trivial merge