]> mj.ucw.cz Git - gallery.git/commitdiff
Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/gallery
authorMartin Mares <mj@ucw.cz>
Sun, 5 Jun 2016 10:26:53 +0000 (12:26 +0200)
committerMartin Mares <mj@ucw.cz>
Sun, 5 Jun 2016 10:26:53 +0000 (12:26 +0200)

Trivial merge