From: Roland Haeder <roland@mxchange.org>
Date: Fri, 27 Feb 2015 15:55:43 +0000 (+0100)
Subject: Merge branch 'master' of gitorious.org:social/mainline into social-master
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=77d780a59e45701839f77a7d15996c90a07b2bd5;p=quix0rs-gnu-social.git

Merge branch 'master' of gitorious.org:social/mainline into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

77d780a59e45701839f77a7d15996c90a07b2bd5
diff --cc lib/apiaction.php
index d85029f433,e672f3a7e6..e672f3a7e6
mode 100644,100755..100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php