From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun, 6 Nov 2011 15:51:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=5b7268befaa7b1151a7e1fc82c11bc66dfad5b4b

Merge remote-tracking branch 'origin/master'
---

5b7268befaa7b1151a7e1fc82c11bc66dfad5b4b