Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Brion Vibber
2010-04-06 15:22:23 -07:00
27 changed files with 6427 additions and 74 deletions