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

author friendica <info@friendica.com>

Sat, 11 Aug 2012 22:42:48 +0000 (15:42 -0700)

committer friendica <info@friendica.com>

Sat, 11 Aug 2012 22:42:48 +0000 (15:42 -0700)
author friendica <info@friendica.com>
Sat, 11 Aug 2012 22:42:48 +0000 (15:42 -0700)
committer friendica <info@friendica.com>
Sat, 11 Aug 2012 22:42:48 +0000 (15:42 -0700)
diff --cc boot.php
Simple merge
diff --cc view/wall_thread.tpl
Simple merge
author	friendica <info@friendica.com>
	Sat, 11 Aug 2012 22:42:48 +0000 (15:42 -0700)
committer	friendica <info@friendica.com>
	Sat, 11 Aug 2012 22:42:48 +0000 (15:42 -0700)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/wall_thread.tpl	patch \|	diff1 \|	diff2 \|	blob \| history