Merge branch 'debian'
authorEvgeni Golov <evgeni@grml.org>
Thu, 28 Aug 2014 15:30:11 +0000 (17:30 +0200)
committerEvgeni Golov <evgeni@grml.org>
Thu, 28 Aug 2014 15:30:11 +0000 (17:30 +0200)
commit1b428f6013d6ef7c8159d803fee1968e1e758e1f
tree2c583aed3e2c9d8544b8cad9820cf355b30fe9b2
parentfdf285d157bf1558728e0b6b6bea3b4f78a7b108
parent1aaec6bd679776a8c9c8f87ea3a509f2c3fe58bc
Merge branch 'debian'

Conflicts:
debian/changelog
debian/changelog