From: Martin Mares Date: Tue, 8 Mar 2016 16:17:01 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/diplomky X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=6a908b2846aabcb5b5af2ca0978995119ab912f0;p=diplomky.git Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/diplomky --- 6a908b2846aabcb5b5af2ca0978995119ab912f0