Merge remote-tracking branch 'deb/debian' into debian-next
authorEvgeni Golov <evgeni@grml.org>
Wed, 13 Feb 2013 21:10:24 +0000 (22:10 +0100)
committerEvgeni Golov <evgeni@grml.org>
Wed, 13 Feb 2013 21:10:24 +0000 (22:10 +0100)

Trivial merge