Merge branch 'release-0.3.6.5' 0.3.6.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 9 Jan 2011 12:20:43 +0000 (13:20 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 9 Jan 2011 12:20:43 +0000 (13:20 +0100)
commit915e48ef36a444907c00e818c8215db172c089a6
treefb1aad065bb270575eb080a0c389ac450cc7c995
parent78732261f2de3d2f885ca02493cb443fc8d8aaf7
parent082341517de049f436e572e4b1eed498edcd1f70
Merge branch 'release-0.3.6.5'