Merge remote-tracking branch 'statusnet/master'
This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained. Conflicts: doc-src/about doc-src/faq plugins/OpenID/doc-src/openid
Showing with 2682 additions and 4042 deletions
Too many changes to show.
To preserve performance only 1000 of 1000+ files are displayed.