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

author Roland Haeder <roland@mxchange.org>

Fri, 27 Feb 2015 15:55:43 +0000 (16:55 +0100)

committer Roland Haeder <roland@mxchange.org>

Fri, 27 Feb 2015 15:55:47 +0000 (16:55 +0100)
author Roland Haeder <roland@mxchange.org>
Fri, 27 Feb 2015 15:55:43 +0000 (16:55 +0100)
committer Roland Haeder <roland@mxchange.org>
Fri, 27 Feb 2015 15:55:47 +0000 (16:55 +0100)
diff --cc lib/apiaction.php

index d85029f4336ade4e9418afad4e7df32fcdf0eac2,e672f3a7e6044b1a717782bceb42cc9247578d73..e672f3a7e6044b1a717782bceb42cc9247578d73

mode 100644,100755..100644
--- 1/lib/apiaction.php
--- 2/lib/apiaction.php
+++ b/lib/apiaction.php
diff --cc lib/framework.php
Simple merge
author	Roland Haeder <roland@mxchange.org>
	Fri, 27 Feb 2015 15:55:43 +0000 (16:55 +0100)
committer	Roland Haeder <roland@mxchange.org>
	Fri, 27 Feb 2015 15:55:47 +0000 (16:55 +0100)
		1	2
lib/apiaction.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/framework.php	patch \|	diff1 \|	diff2 \|	blob \| history