Merge branch 'release-0.7.4' 0.7.4
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 21 Nov 2011 18:10:53 +0000 (19:10 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Mon, 21 Nov 2011 18:10:53 +0000 (19:10 +0100)

Trivial merge