From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 12 Aug 2013 10:23:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'statusnet/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f79aec36feaa4760201a7e88d5b31513a3c458ba;p=quix0rs-gnu-social.git

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
---

f79aec36feaa4760201a7e88d5b31513a3c458ba