Merge branch 'release-0.8.5' 0.8.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 29 Jun 2013 14:19:50 +0000 (16:19 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 29 Jun 2013 14:19:50 +0000 (16:19 +0200)

Trivial merge