]> mj.ucw.cz Git - temple.git/commitdiff
Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/temple
authorMartin Mares <mj@ucw.cz>
Wed, 12 Aug 2015 10:21:58 +0000 (12:21 +0200)
committerMartin Mares <mj@ucw.cz>
Wed, 12 Aug 2015 10:21:58 +0000 (12:21 +0200)
1  2 
UCW/Temple.pm

diff --cc UCW/Temple.pm
Simple merge