Merge branch 'release-0.9.6' 0.9.6
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 26 Oct 2016 16:48:04 +0000 (18:48 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 26 Oct 2016 16:48:04 +0000 (18:48 +0200)
commit7b55e0be6a3283e43a9bbab98f82aebdd948eb33
tree24b3da6c7d19532d092b2b8e93367356a771c79e
parentc4ae226ec5052116cefc542ae2017036a7bc6332
parentff7d6b4652e7ff3c035cf89516b134daf5f756b7
Merge branch 'release-0.9.6'