Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
authorJan Kratochvil <jan.kratochvil@redhat.com>
Sun, 27 Nov 2011 23:08:19 +0000 (00:08 +0100)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Sun, 27 Nov 2011 23:08:19 +0000 (00:08 +0100)
commiteb87f643786bc660e4f08810055acccbc70105ab
treeb63be8ac82a7b36613c7cbb35f8094d3f9e4dd46
parent8e60e4fcf685219e697dad7dcc240c6c405c3002
parentc561aebbf415c029778421793ae2ac773e0c76cf
Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome

Conflicts:
.ssh/known_hosts
.ssh/known_hosts