Merge branch 'debian'
authorEvgeni Golov <evgeni@grml.org>
Mon, 17 Dec 2012 14:51:02 +0000 (15:51 +0100)
committerEvgeni Golov <evgeni@grml.org>
Mon, 17 Dec 2012 14:51:02 +0000 (15:51 +0100)
commite651a4fbfe518f6a3a8759037dcf41861639f665
tree8e9df0a4fe71c075c4743f5a9969fda84f648633
parent7643e5a740c171837e4985b30bf475724b94c2af
parent04ecb83516c5795cf4a1da19cf73b90ebd8d2747
Merge branch 'debian'

Conflicts:
debian/changelog
debian/changelog