]> mj.ucw.cz Git - diplomky.git/commitdiff
Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/diplomky
authorMartin Mares <mj@ucw.cz>
Tue, 8 Mar 2016 16:17:01 +0000 (17:17 +0100)
committerMartin Mares <mj@ucw.cz>
Tue, 8 Mar 2016 16:17:01 +0000 (17:17 +0100)

Trivial merge