Merge branch 'debian'
authorEvgeni Golov <evgeni@grml.org>
Sun, 26 Oct 2014 10:30:44 +0000 (11:30 +0100)
committerEvgeni Golov <evgeni@grml.org>
Sun, 26 Oct 2014 10:30:44 +0000 (11:30 +0100)
commita4f774e4aaff6f61045b0cc163de68639f84c180
treed8507454357413279482f8d5373ee0be2d0bf69b
parenta574e0a00b7a66f8901baaf5512f0e8e8a923a79
parent6200502b939da2926595fd5bc644041599dec0e5
Merge branch 'debian'

Conflicts:
debian/changelog
debian/control
debian/changelog
debian/control