Merge branch 'release/0.9.3' 0.9.3
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 22 Jul 2015 18:57:58 +0000 (20:57 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 22 Jul 2015 18:57:58 +0000 (20:57 +0200)

Trivial merge