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

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

3a45d4f9e0af301b8fdd4d509fc7ffe7514fb519
diff --cc view/theme/diabook/communityhome.tpl
index 6fa330140a,caefed3b38..caefed3b38
mode 100644,100755..100644
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
diff --cc view/theme/diabook/theme.php
index 8a7bf19e96,f701d7d832..f701d7d832
mode 100644,100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php