From: root <jan.kratochvil@redhat.com>
Date: Sat, 3 Jan 2015 15:40:58 +0000 (+0100)
Subject: Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=e36f4e85c46f2f9eedcfc9b64dded50171364c0f

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

e36f4e85c46f2f9eedcfc9b64dded50171364c0f