Merge branch 'feature/fix-logging' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 20 Jul 2015 04:38:13 +0000 (06:38 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 20 Jul 2015 04:38:13 +0000 (06:38 +0200)

Trivial merge