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

author Vasudev Kamath <kamathvasudev@gmail.com>

Mon, 4 Jun 2012 06:34:17 +0000 (12:04 +0530)

committer Vasudev Kamath <kamathvasudev@gmail.com>

Mon, 4 Jun 2012 06:34:17 +0000 (12:04 +0530)
author Vasudev Kamath <kamathvasudev@gmail.com>
Mon, 4 Jun 2012 06:34:17 +0000 (12:04 +0530)
committer Vasudev Kamath <kamathvasudev@gmail.com>
Mon, 4 Jun 2012 06:34:17 +0000 (12:04 +0530)
diff --cc include/security.php

index a92400b5c401a4d419a027f8d42e836ee6dce46c,af201d2af1853afd41284ee5306e49d6fe9500ea..af201d2af1853afd41284ee5306e49d6fe9500ea

mode 100644,100755..100644
--- 1/include/security.php
--- 2/include/security.php
+++ b/include/security.php
diff --cc view/theme/diabook/theme.php

index f701d7d8329a0d2e4fc7703164e8fb14bd21d1c1,83079782e87676a2aa4f5dec69d88e6a2d780128..83079782e87676a2aa4f5dec69d88e6a2d780128

mode 100644,100755..100644
--- 1/view/theme/diabook/theme.php
--- 2/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
author	Vasudev Kamath <kamathvasudev@gmail.com>
	Mon, 4 Jun 2012 06:34:17 +0000 (12:04 +0530)
committer	Vasudev Kamath <kamathvasudev@gmail.com>
	Mon, 4 Jun 2012 06:34:17 +0000 (12:04 +0530)
		1	2
include/security.php	patch \|	diff1 \|	diff2 \|	blob \| history
view/theme/diabook/theme.php	patch \|	diff1 \|	diff2 \|	blob \| history