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)
commit8104eca7d9cf4376bfa2eddc3c2a71b84b9d9d02
tree4c8f8e6f4941bbf2cb31fe9ed69031f8b160e580
parente36f4e85c46f2f9eedcfc9b64dded50171364c0f
parent3f93f2fef21736b9e9f0630bac114ce28f2e7571
Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome