Merge branch 'debian-next' into master-next
authorEvgeni Golov <evgeni@grml.org>
Wed, 13 Feb 2013 21:14:29 +0000 (22:14 +0100)
committerEvgeni Golov <evgeni@grml.org>
Wed, 13 Feb 2013 21:14:29 +0000 (22:14 +0100)
commitd9586141f1bf766d5cfd77346bc48e6885d5762f
treea0ca9d1939707a019902bd76a04e41e27c4f63b7
parent172a5bf6b6129acb85496863b9f2b71b5ad86193
parentdf0bd3d4eef12e1ba0c9630dcaa5dee3806815f7
Merge branch 'debian-next' into master-next

Conflicts:
debian/changelog
debian/changelog
debian/rules