Merge branch 'planetdump-ng'
authorTom Hughes <tom@compton.nu>
Mon, 22 Dec 2014 14:38:59 +0000 (14:38 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 22 Dec 2014 14:38:59 +0000 (14:38 +0000)

Trivial merge