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

author Alexander Kampmann <programmer@nurfuerspam.de>

Mon, 9 Apr 2012 12:28:21 +0000 (14:28 +0200)

committer Alexander Kampmann <programmer@nurfuerspam.de>

Mon, 9 Apr 2012 12:28:21 +0000 (14:28 +0200)
author Alexander Kampmann <programmer@nurfuerspam.de>
Mon, 9 Apr 2012 12:28:21 +0000 (14:28 +0200)
committer Alexander Kampmann <programmer@nurfuerspam.de>
Mon, 9 Apr 2012 12:28:21 +0000 (14:28 +0200)
diff --cc boot.php
Simple merge
diff --cc view/de/strings.php
Simple merge
author	Alexander Kampmann <programmer@nurfuerspam.de>
	Mon, 9 Apr 2012 12:28:21 +0000 (14:28 +0200)
committer	Alexander Kampmann <programmer@nurfuerspam.de>
	Mon, 9 Apr 2012 12:28:21 +0000 (14:28 +0200)
		1	2
boot.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/de/strings.php	patch \|	diff1 \|	diff2 \|	blob \| history