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

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

ba4db236ecff1ffdb56adc2715b3f53515f8cb34
diff --cc view/theme/diabook/directory_item.tpl
index bc2af16c21,70d1979551..70d1979551
mode 100644,100755..100644
--- a/view/theme/diabook/directory_item.tpl
+++ b/view/theme/diabook/directory_item.tpl
diff --cc view/theme/diabook/jot.tpl
index 79151aeedb,1d94cb6d3c..1d94cb6d3c
mode 100644,100755..100644
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
diff --cc view/theme/diabook/theme.php
index 83079782e8,53048df6cd..53048df6cd
mode 100644,100755..100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php