Update grml-etc conflict due to configfile move
authorUlrich Dangel <mru@grml.org>
Sun, 11 Dec 2011 16:43:52 +0000 (17:43 +0100)
committerUlrich Dangel <mru@grml.org>
Sun, 11 Dec 2011 16:43:52 +0000 (17:43 +0100)
commitb001ef62c19bcc1f89b502ba2535dcb319e4e8c9
tree2f241366de7af37073980678428c9e28c48e8cd4
parentd3b417ccec9484f6eb8f2adc1b05f4ec8aabb40d
Update grml-etc conflict due to configfile move
debian/control