Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
authorroot <jan.kratochvil@redhat.com>
Wed, 25 May 2016 16:45:21 +0000 (18:45 +0200)
committerroot <jan.kratochvil@redhat.com>
Wed, 25 May 2016 16:45:21 +0000 (18:45 +0200)

Trivial merge