Merge branch '0.9.x' into testing 0.9.0rc2
authorEvan Prodromou <evan@status.net>
Thu, 17 Dec 2009 03:14:41 +0000 (22:14 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 17 Dec 2009 03:14:41 +0000 (22:14 -0500)
commit530673b3cd79d2d3f1b51b013d2b764d751bc7a2
tree26d0e31dc2db625784b82dd670f57c49f338a426
parent2a1468ec8b2918553b490ddaef6bdede3e2d5b1b
parent7ee875b10ffbf9fae0934426d6abda2be48d01c7
Merge branch '0.9.x' into testing