From: Vasudev Kamath <kamathvasudev@gmail.com>
Date: Fri, 27 Apr 2012 17:13:26 +0000 (+0530)
Subject: Merge branch 'master' of git://github.com/friendica/friendica
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=214ec91a3f2c5fec6cced93f669b3a9725f0e40a;p=friendica.git

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

214ec91a3f2c5fec6cced93f669b3a9725f0e40a
diff --cc view/theme/diabook/group_side.tpl
index 1c8ebcd9fb,ce4b25fbf7..ce4b25fbf7
mode 100644,100755..100644
--- a/view/theme/diabook/group_side.tpl
+++ b/view/theme/diabook/group_side.tpl
diff --cc view/theme/diabook/theme.php
index e8518a1c6f,c45db9884d..c45db9884d
mode 100644,100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php