Merge branch 'release-0.6.5' 0.6.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 19 Jun 2011 14:27:08 +0000 (16:27 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Sun, 19 Jun 2011 14:27:08 +0000 (16:27 +0200)
commit47ed7eaf00c35889781831d33d04e9f91c9ad266
treed25941e2a22fec3952956fc97ad50aa37f3d3b7a
parentb72db16cd16e8bfbaadc44604bdff3f49a1aff51
parent42eaf7c133f362134093990eaa2c8aa9e12b8a11
Merge branch 'release-0.6.5'