From: Mikael Nordfeldth <mmn@hethane.se>
Date: Fri, 27 Feb 2015 09:01:55 +0000 (+0100)
Subject: Merge branch 'master' into nightly
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c214aa5149df0e0804c362021c209f78b5ee6483;p=quix0rs-gnu-social.git

Merge branch 'master' into nightly

Conflicts:
	lib/apiaction.php
---

c214aa5149df0e0804c362021c209f78b5ee6483