Merge remote-tracking branch 'deb/debian' into debian-next
authorEvgeni Golov <evgeni@debian.org>
Mon, 4 Mar 2013 17:16:36 +0000 (18:16 +0100)
committerEvgeni Golov <evgeni@debian.org>
Mon, 4 Mar 2013 17:16:36 +0000 (18:16 +0100)

Trivial merge