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

author Roland Haeder <roland@mxchange.org>

Tue, 24 Feb 2015 22:47:12 +0000 (23:47 +0100)

committer Roland Haeder <roland@mxchange.org>

Tue, 24 Feb 2015 22:47:19 +0000 (23:47 +0100)
author Roland Haeder <roland@mxchange.org>
Tue, 24 Feb 2015 22:47:12 +0000 (23:47 +0100)
committer Roland Haeder <roland@mxchange.org>
Tue, 24 Feb 2015 22:47:19 +0000 (23:47 +0100)
diff --cc classes/File.php
Simple merge
diff --cc classes/File_thumbnail.php
Simple merge
diff --cc classes/Notice.php
Simple merge
diff --cc lib/default.php
Simple merge
diff --cc scripts/upgrade.php
Simple merge
author	Roland Haeder <roland@mxchange.org>
	Tue, 24 Feb 2015 22:47:12 +0000 (23:47 +0100)
committer	Roland Haeder <roland@mxchange.org>
	Tue, 24 Feb 2015 22:47:19 +0000 (23:47 +0100)
		1	2
classes/File.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/File_thumbnail.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/Notice.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/default.php	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/upgrade.php	patch \|	diff1 \|	diff2 \|	blob \| history