Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Tue, 30 Jul 2013 19:42:42 +0000 (21:42 +0200)
committerFranck Joncourt <franck@debian.org>
Tue, 30 Jul 2013 19:42:42 +0000 (21:42 +0200)

Trivial merge