Merge branch 'release/0.9' into next
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Jul 2015 19:19:47 +0000 (21:19 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 15 Jul 2015 19:19:47 +0000 (21:19 +0200)

Trivial merge