Merge branch 'release-0.3.6.2' 0.3.6.2
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 23:57:39 +0000 (00:57 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Thu, 30 Dec 2010 23:57:39 +0000 (00:57 +0100)
commit9fa23d5eeb25f2710031bc13a843191177784b50
treeaa217e29ea727ed472e6441ffff36da3e45c76ce
parent35d7f770242ec62fb246d914c892a9ffec2def60
parent5cf3fc22509ea9f74a0b05c09c4a21d345b716ca
Merge branch 'release-0.3.6.2'