Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements

author friendica <info@friendica.com>

Sat, 12 Jan 2013 20:28:14 +0000 (12:28 -0800)

committer friendica <info@friendica.com>

Sat, 12 Jan 2013 20:28:14 +0000 (12:28 -0800)
author friendica <info@friendica.com>
Sat, 12 Jan 2013 20:28:14 +0000 (12:28 -0800)
committer friendica <info@friendica.com>
Sat, 12 Jan 2013 20:28:14 +0000 (12:28 -0800)
diff --cc boot.php
Simple merge
diff --cc include/text.php
Simple merge
author	friendica <info@friendica.com>
	Sat, 12 Jan 2013 20:28:14 +0000 (12:28 -0800)
committer	friendica <info@friendica.com>
	Sat, 12 Jan 2013 20:28:14 +0000 (12:28 -0800)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
include/text.php	patch \|	diff1 \|	diff2 \|	blob \| history