Merge branch 'release/0.9-rc1' 0.9-rc1
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 16 Jun 2015 15:54:09 +0000 (17:54 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 16 Jun 2015 15:54:09 +0000 (17:54 +0200)

Trivial merge