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

author Roland Haeder <roland@mxchange.org>

Wed, 18 Mar 2015 16:07:48 +0000 (17:07 +0100)

committer Roland Haeder <roland@mxchange.org>

Wed, 18 Mar 2015 16:07:59 +0000 (17:07 +0100)
author Roland Haeder <roland@mxchange.org>
Wed, 18 Mar 2015 16:07:48 +0000 (17:07 +0100)
committer Roland Haeder <roland@mxchange.org>
Wed, 18 Mar 2015 16:07:59 +0000 (17:07 +0100)
diff --cc lib/action.php
Simple merge
diff --cc lib/default.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Roland Haeder <roland@mxchange.org>
	Wed, 18 Mar 2015 16:07:48 +0000 (17:07 +0100)
committer	Roland Haeder <roland@mxchange.org>
	Wed, 18 Mar 2015 16:07:59 +0000 (17:07 +0100)
		1	2
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/default.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history