From: Karryanna <karry@karryanna.cz>
Date: Tue, 12 May 2015 12:29:25 +0000 (+0200)
Subject: Merge branch 'master' into labelling
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=3eccb27b874cf751c7c807ce444b8bcb37ecf768;p=leo.git

Merge branch 'master' into labelling
---

3eccb27b874cf751c7c807ce444b8bcb37ecf768