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
..
2011-09-30 14:33:08 -04:00
2011-09-30 14:53:30 -04:00
faq
2011-09-30 14:53:23 -04:00
2011-09-30 14:53:16 -04:00
2011-09-30 14:53:10 -04:00
2011-09-30 14:53:01 -04:00