Merge branch 'release-0.5.2' 0.5.2
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 29 Mar 2011 18:24:36 +0000 (20:24 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Tue, 29 Mar 2011 18:24:36 +0000 (20:24 +0200)
commitcf563ebda93371a3088a1789eb628ed568658b14
tree03a55a9d192de5b7787878a9960c7944ae4d1519
parent963582b5c941b1abb4fa26555aece340184956e1
parent260a2d9e51c13128a49c4ef9020c5cdfbbcf3cb2
Merge branch 'release-0.5.2'