Merge branch 'master' into 0.9.x
authorBrion Vibber <brion@status.net>
Thu, 12 Aug 2010 19:55:36 +0000 (12:55 -0700)
committerBrion Vibber <brion@status.net>
Thu, 12 Aug 2010 19:55:36 +0000 (12:55 -0700)
commitc3475e6ebef594460ec3685a007e7298fcbd9833
treec0d0922f5c74f6b945a96f8caa198798a0980e2f
parent4cf58c4bc79bc2809435c9af0f60b746b898dd58
parent78eea352b4ad142e58b598c50929d5a4edb991fc
Merge branch 'master' into 0.9.x