Merge branch 'release-0.7.5' 0.7.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 29 Nov 2011 08:00:13 +0000 (09:00 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 29 Nov 2011 08:00:13 +0000 (09:00 +0100)

Trivial merge