Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
authorJan Kratochvil <jan.kratochvil@redhat.com>
Thu, 1 Dec 2011 00:57:10 +0000 (01:57 +0100)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Thu, 1 Dec 2011 00:57:10 +0000 (01:57 +0100)

Trivial merge