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)
commit6e9a43ccd93ae125720547c0fe421dc81a54ba90
tree6bba9dfc6af4c551510f4d6adcf74cccf815a4f8
parentb64f7d11fca2a616c8ceaf146a79fc3782877afd
parent80bc233fbfe34c86f40b3966314adce6b68a572a
Merge branch 'release-0.8.5'