Merge remote-tracking branch 'deb/debian' into debian
authorEvgeni Golov <evgeni@debian.org>
Tue, 4 Dec 2012 14:08:51 +0000 (15:08 +0100)
committerEvgeni Golov <evgeni@debian.org>
Tue, 4 Dec 2012 14:08:51 +0000 (15:08 +0100)

Trivial merge