Merge branch 'release-0.9.5' 0.9.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 11 Jul 2016 17:55:51 +0000 (19:55 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 11 Jul 2016 17:55:51 +0000 (19:55 +0200)
commitc4ae226ec5052116cefc542ae2017036a7bc6332
treec2071756f95a17afbf11476c429926cb566216dd
parent76ed638264e531a26e35647d13702db865a52321
parent127c9254bf50131e57e5e1313cb92c86dccbfa6c
Merge branch 'release-0.9.5'