Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
authorEvan Prodromou <evan@status.net>
Mon, 19 Oct 2009 21:00:36 +0000 (17:00 -0400)
committerEvan Prodromou <evan@status.net>
Mon, 19 Oct 2009 21:00:36 +0000 (17:00 -0400)
commitfe1ae3a47edb09e3fd144589f095bfc40637ca2a
tree8990cfccb7d8bcaa5635fcdc12513dcda76b55c7
parent9d0e37c4e847f312c39eaf15deb95ff3777c13a6
parentf049d669d95128741f9cb7b1604b758df0550360
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing