Merge branch 'debian'
authorEvgeni Golov <evgeni@grml.org>
Mon, 17 Dec 2012 19:57:22 +0000 (20:57 +0100)
committerEvgeni Golov <evgeni@grml.org>
Mon, 17 Dec 2012 19:57:22 +0000 (20:57 +0100)
commit058d366463073e6c720c8c72847ea4ba78d58d4a
tree0f803f7322883fea8975d25f9dcdb1ff72aba455
parent2b17ff5163bbdae8dd11861e1b526a0057786601
parentd0ed1be8f69b8a427aa983017d5a8a2f3255ea73
Merge branch 'debian'

Conflicts:
debian/changelog
debian/control
debian/changelog
debian/control
debian/live-boot-grml.bug-presubj