Merge branch 'release-0.7.6' 0.7.6
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 7 Dec 2011 18:29:00 +0000 (19:29 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 7 Dec 2011 18:29:00 +0000 (19:29 +0100)

Trivial merge