Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 0 insertions, 25 deletions

diff --git a/doc/html/classConversation.js b/doc/html/classConversation.js
deleted file mode 100644
index 4b709069f..000000000
--- a/doc/html/classConversation.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var classConversation =
-[
-    [ "__construct", "classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09", null ],
-    [ "add_thread", "classConversation.html#a8335cdd43f1836e3c255638e61a09e16", null ],
-    [ "get_cipher", "classConversation.html#a4aab60bb39fa6761b6cacdc8d9da2901", null ],
-    [ "get_mode", "classConversation.html#a87a0d704d5f2b1a008cc2e9ce06a1bcd", null ],
-    [ "get_observer", "classConversation.html#ae3d4190142e12b57051f11f2911f77a0", null ],
-    [ "get_profile_owner", "classConversation.html#a5effe8ad3007e01333df44b81432b813", null ],
-    [ "get_template_data", "classConversation.html#ac5900b46e6a1c93360bb8e58f8b3540b", null ],
-    [ "get_thread", "classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8", null ],
-    [ "is_commentable", "classConversation.html#a8b47c92b69459d461ea3cc9aae9597a3", null ],
-    [ "is_preview", "classConversation.html#adf25ce023b69a166c63c6e84e02c136a", null ],
-    [ "is_writable", "classConversation.html#a5879199008b96bee7550b576d614e1c1", null ],
-    [ "set_mode", "classConversation.html#a66f121ca4026246f86a732e5faa0682c", null ],
-    [ "set_profile_owner", "classConversation.html#a8898bddc1e8990e81dab9a13a532cc93", null ],
-    [ "$cipher", "classConversation.html#aa95c1a62af38bdfba7add9549bec083b", null ],
-    [ "$commentable", "classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6", null ],
-    [ "$mode", "classConversation.html#afb03d1648dbfafe62caa1e30f32f2b1a", null ],
-    [ "$observer", "classConversation.html#a8748445aa26047ebed5141f3c3cbc244", null ],
-    [ "$prepared_item", "classConversation.html#a5b6adbb2fe24f0f53d6c22660dff91b2", null ],
-    [ "$preview", "classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae", null ],
-    [ "$profile_owner", "classConversation.html#a2f12724ef0244e9049fe1bb9641b516d", null ],
-    [ "$threads", "classConversation.html#a41f4a549e6a99f98935c4742addd22c8", null ],
-    [ "$writable", "classConversation.html#ae81221251307e315f566a11f921ce0a9", null ]
-];
\ No newline at end of file