Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
authorJan Kratochvil <jan.kratochvil@redhat.com>
Wed, 31 Jul 2013 13:53:17 +0000 (15:53 +0200)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Wed, 31 Jul 2013 13:53:17 +0000 (15:53 +0200)
1  2 
.bashrc

diff --cc .bashrc
Simple merge