Merge branch 'remove-configuration-cleaning-216' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 5 Sep 2012 12:56:15 +0000 (14:56 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 5 Sep 2012 12:56:15 +0000 (14:56 +0200)
This resolves #216.


Trivial merge