From: Martin Mares Date: Wed, 12 Aug 2015 10:21:58 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/temple X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=deeadb231e0e0da953a7add90947d9633c1b15ef;p=temple.git Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/temple --- deeadb231e0e0da953a7add90947d9633c1b15ef