From: Martin Mares <mj@ucw.cz>
Date: Wed, 23 Dec 2015 18:39:50 +0000 (+0100)
Subject: Merge branch 'xft' of ssh://git.ucw.cz/home/mj/GIT/osdd into xft
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=d4ad40d60a4538e4310541555c92c037fc26bff0;p=osdd.git

Merge branch 'xft' of ssh://git.ucw.cz/home/mj/GIT/osdd into xft
---

d4ad40d60a4538e4310541555c92c037fc26bff0