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

author Roland Haeder <roland@mxchange.org>

Sun, 1 Mar 2015 12:02:10 +0000 (13:02 +0100)

committer Roland Haeder <roland@mxchange.org>

Sun, 1 Mar 2015 12:02:31 +0000 (13:02 +0100)
author Roland Haeder <roland@mxchange.org>
Sun, 1 Mar 2015 12:02:10 +0000 (13:02 +0100)
committer Roland Haeder <roland@mxchange.org>
Sun, 1 Mar 2015 12:02:31 +0000 (13:02 +0100)
diff --cc actions/register.php
Simple merge
diff --cc lib/installer.php
Simple merge
diff --cc plugins/EmailRegistration/actions/emailregister.php
Simple merge
diff --cc plugins/TwitterBridge/actions/twitterauthorization.php
Simple merge
author	Roland Haeder <roland@mxchange.org>
	Sun, 1 Mar 2015 12:02:10 +0000 (13:02 +0100)
committer	Roland Haeder <roland@mxchange.org>
	Sun, 1 Mar 2015 12:02:31 +0000 (13:02 +0100)
		1	2
actions/register.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/installer.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/EmailRegistration/actions/emailregister.php	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/TwitterBridge/actions/twitterauthorization.php	patch \|	diff1 \|	diff2 \|	blob \| history