Merge https://github.com/friendica/friendica into pull

author friendica <info@friendica.com>

Tue, 6 Nov 2012 09:10:36 +0000 (01:10 -0800)

committer friendica <info@friendica.com>

Tue, 6 Nov 2012 09:10:36 +0000 (01:10 -0800)
author friendica <info@friendica.com>
Tue, 6 Nov 2012 09:10:36 +0000 (01:10 -0800)
committer friendica <info@friendica.com>
Tue, 6 Nov 2012 09:10:36 +0000 (01:10 -0800)
diff --cc boot.php
Simple merge
diff --cc include/items.php
Simple merge
author	friendica <info@friendica.com>
	Tue, 6 Nov 2012 09:10:36 +0000 (01:10 -0800)
committer	friendica <info@friendica.com>
	Tue, 6 Nov 2012 09:10:36 +0000 (01:10 -0800)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/items.php	patch \|	diff1 \|	diff2 \|	blob \| history