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, 7 deletions

diff --git a/doc/html/connections_8php.js b/doc/html/connections_8php.js
deleted file mode 100644
index 962b1f866..000000000
--- a/doc/html/connections_8php.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var connections_8php =
-[
-    [ "connections_clone", "connections_8php.html#a15af118efee9c948b6f8294e54a73bb2", null ],
-    [ "connections_content", "connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c", null ],
-    [ "connections_init", "connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558", null ],
-    [ "connections_post", "connections_8php.html#a1224058db8e3fb56463eb312f98e561d", null ]
-];
\ No newline at end of file