Merge remote-tracking branch 'origin/master'
authorSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:12:43 +0000 (21:12 +0100)
committerSimon McVittie <smcv@debian.org>
Mon, 15 Sep 2014 20:12:43 +0000 (21:12 +0100)

Trivial merge