]> mj.ucw.cz Git - osdd.git/commitdiff
Merge branch 'xft' of ssh://git.ucw.cz/home/mj/GIT/osdd into xft
authorMartin Mares <mj@ucw.cz>
Wed, 23 Dec 2015 18:39:50 +0000 (19:39 +0100)
committerMartin Mares <mj@ucw.cz>
Wed, 23 Dec 2015 18:39:50 +0000 (19:39 +0100)

Trivial merge