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

author Roland Haeder <roland@mxchange.org>

Tue, 10 Mar 2015 23:20:34 +0000 (00:20 +0100)

committer Roland Haeder <roland@mxchange.org>

Tue, 10 Mar 2015 23:35:42 +0000 (00:35 +0100)
author Roland Haeder <roland@mxchange.org>
Tue, 10 Mar 2015 23:20:34 +0000 (00:20 +0100)
committer Roland Haeder <roland@mxchange.org>
Tue, 10 Mar 2015 23:35:42 +0000 (00:35 +0100)
diff --cc classes/Avatar.php
Simple merge
diff --cc lib/action.php
Simple merge
diff --cc lib/formaction.php
Simple merge
author	Roland Haeder <roland@mxchange.org>
	Tue, 10 Mar 2015 23:20:34 +0000 (00:20 +0100)
committer	Roland Haeder <roland@mxchange.org>
	Tue, 10 Mar 2015 23:35:42 +0000 (00:35 +0100)
		1	2
classes/Avatar.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/action.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/formaction.php	patch \|	diff1 \|	diff2 \|	blob \| history