Merge branch 'master' into 0.8.x
authorEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:15:36 +0000 (17:15 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 24 Sep 2009 21:15:36 +0000 (17:15 -0400)
commitb5b3690eef0b9223bc5dbfd2a72de165ca8112ad
tree25f0e021dc44be3c18fbf27d6727c49a06ab354e
parentdfff99ecc8f54465c1af806adaa77fb98744ce3d
parentfd86c6eb1997ae3c9cd4b143ee253784d7603a6b
Merge branch 'master' into 0.8.x