Merge branch 'release-0.4' 0.4
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 15 Jan 2011 22:14:09 +0000 (23:14 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 15 Jan 2011 22:14:09 +0000 (23:14 +0100)
commitd53a79eeb9531a08173431ce2ba19156eeca4a0c
treea3b0b6381cf86951b1c4515435ff361158a22f89
parentfa63b855e28c5fbf270bfdca1bb23fd048affae5
parent1382a8909d86ef3d397217601ebb934abd9849a3
Merge branch 'release-0.4'