Merge remote-tracking branch 'origin/master'
authorSimon McVittie <smcv@debian.org>
Wed, 26 Nov 2014 11:33:23 +0000 (11:33 +0000)
committerSimon McVittie <smcv@debian.org>
Wed, 26 Nov 2014 11:33:23 +0000 (11:33 +0000)

Trivial merge