Merge branch 'debian'
authorEvgeni Golov <evgeni@grml.org>
Wed, 10 Dec 2014 11:36:09 +0000 (12:36 +0100)
committerEvgeni Golov <evgeni@grml.org>
Wed, 10 Dec 2014 11:36:09 +0000 (12:36 +0100)
commitb7a3e19985de7d7a4bbe534b68f372ba40511b82
tree050da2d13aa9dfa0e5840bf7bc39c80d1d11e091
parentca03a162d637be11cbee3804dee75dbd1d37d0d6
parent6b123988267c263a2b12a43c9e9d2c9ff60104ba
Merge branch 'debian'

Conflicts:
debian/changelog
debian/changelog