From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Mon, 4 Jun 2012 06:34:17 +0000 (+0530)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89;p=friendica.git

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

12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89
diff --cc include/security.php
index a92400b5c4,af201d2af1..af201d2af1
mode 100644,100755..100644
--- a/include/security.php
+++ b/include/security.php
diff --cc view/theme/diabook/theme.php
index f701d7d832,83079782e8..83079782e8
mode 100644,100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php