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
..
2013-02-13 10:55:32 -05:00
2011-04-08 01:22:02 +02:00
2011-05-27 12:22:47 -04:00
2012-07-10 12:25:40 -04:00
2012-07-09 09:46:27 -04:00
2012-07-03 17:33:27 -04:00
2013-07-16 10:57:06 -07:00