Merge branch 'master' of git://github.com/friendica/friendica

author Tobias Hößl <tobias@hoessl.eu>

Mon, 12 Mar 2012 19:06:45 +0000 (19:06 +0000)

committer Tobias Hößl <tobias@hoessl.eu>

Mon, 12 Mar 2012 19:06:45 +0000 (19:06 +0000)
author Tobias Hößl <tobias@hoessl.eu>
Mon, 12 Mar 2012 19:06:45 +0000 (19:06 +0000)
committer Tobias Hößl <tobias@hoessl.eu>
Mon, 12 Mar 2012 19:06:45 +0000 (19:06 +0000)
diff --cc boot.php
Simple merge
diff --cc mod/network.php
Simple merge
author	Tobias Hößl <tobias@hoessl.eu>
	Mon, 12 Mar 2012 19:06:45 +0000 (19:06 +0000)
committer	Tobias Hößl <tobias@hoessl.eu>
	Mon, 12 Mar 2012 19:06:45 +0000 (19:06 +0000)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/network.php	patch \|	diff1 \|	diff2 \|	blob \| history