From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Sat, 12 May 2012 06:40:09 +0000 (+0530)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=10db2f00f9f90cb7ee9fbd94a5c986427de779c2;p=friendica.git

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

10db2f00f9f90cb7ee9fbd94a5c986427de779c2
diff --cc view/theme/diabook/communityhome.tpl
index 0386d63d36,6fa330140a..6fa330140a
mode 100644,100755..100644
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
diff --cc view/theme/diabook/theme.php
index f8fdeb8b1a,8a7bf19e96..8a7bf19e96
mode 100644,100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php