Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
authorBrion Vibber <brion@pobox.com>
Mon, 8 Feb 2010 23:47:55 +0000 (15:47 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 8 Feb 2010 23:47:55 +0000 (15:47 -0800)
commit4e6f587f868d71f08c618d0dedf6ddf0331619c2
treec94a60cc0d6a37b2a97e8aa6bd646f13f6fc4b1e
parentb9b0f0410aa688cc3ee77df1563773527a8d59a9
parent96ef4435b61570dbbf15d921a42543bfb13786c0
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing