Merge branch 'feature/deliver-everything-from-filesystem' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 27 Jul 2015 18:28:26 +0000 (20:28 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 27 Jul 2015 18:28:26 +0000 (20:28 +0200)

Trivial merge