From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu, 1 Dec 2011 00:57:10 +0000 (+0100)
Subject: Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=4ec6301ec4dfecc574bf3afb6ef791118764ec9d

Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
---

4ec6301ec4dfecc574bf3afb6ef791118764ec9d