Merge branch 'release-0.6.1' 0.6.1
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 10 Apr 2011 19:06:23 +0000 (21:06 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 10 Apr 2011 19:06:23 +0000 (21:06 +0200)
commit58eeba9b521b0a0094ac90a37fd88811c6a27376
treec4af64f01cbd47a5e83b11575b232f89488dc388
parentee05a67b3f1e796b6c4bdcd709ef0983103c455f
parentce3f61cf449827088fa84c778b1715ca90b15a96
Merge branch 'release-0.6.1'