Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
authorroot <jan.kratochvil@redhat.com>
Sat, 3 Jan 2015 15:40:58 +0000 (16:40 +0100)
committerroot <jan.kratochvil@redhat.com>
Sat, 3 Jan 2015 15:40:58 +0000 (16:40 +0100)
1  2 
src/INSTALL

diff --cc src/INSTALL
Simple merge