Mikael Nordfeldth f79aec36fe 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		2013-08-12 12:23:17 +02:00
..
statusnet.po	Merge remote-tracking branch 'statusnet/master'	2013-08-12 12:23:17 +02:00