Merge commit 'debian/3.0_a17-1' into debian
authorUlrich Dangel <mru@grml.org>
Thu, 2 Jun 2011 18:55:10 +0000 (20:55 +0200)
committerUlrich Dangel <mru@grml.org>
Thu, 2 Jun 2011 18:55:10 +0000 (20:55 +0200)
commit8ea46e829fe6ab3fc1e1c11254ec8062c02d2e82
tree26360a697830975b6a42f2ee0045dbbc3eab8fb5
parentb3648df585c66e00515f9d5bd8e9c87df33735cf
parent02db2e8d985c8bb87a3bb4d265061bd4aee2c721
Merge commit 'debian/3.0_a17-1' into debian