Merge remote-tracking branch 'upstream/master'
authorFranck Joncourt <franck@debian.org>
Sat, 27 Apr 2013 20:38:27 +0000 (22:38 +0200)
committerFranck Joncourt <franck@debian.org>
Sat, 27 Apr 2013 20:38:27 +0000 (22:38 +0200)

Trivial merge