Merge branch 'release-0.6' 0.6
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 2 Apr 2011 22:14:03 +0000 (00:14 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sat, 2 Apr 2011 22:14:03 +0000 (00:14 +0200)
commitee05a67b3f1e796b6c4bdcd709ef0983103c455f
treeefa07b0bc945aa85c41749858332743264bf3905
parentcf563ebda93371a3088a1789eb628ed568658b14
parent059d5bcfe45348dd3b7ff15a6de0597c197e890c
Merge branch 'release-0.6'