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

diff --git a/doc/html/session_8php.js b/doc/html/session_8php.js
deleted file mode 100644
index 5d69851d0..000000000
--- a/doc/html/session_8php.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var session_8php =
-[
-    [ "new_cookie", "session_8php.html#a4c0ead624f95483e386bc80abf570a8f", null ],
-    [ "ref_session_close", "session_8php.html#a5e1c616e02b863d5450317d101366bb7", null ],
-    [ "ref_session_destroy", "session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052", null ],
-    [ "ref_session_gc", "session_8php.html#ac95373f4966862a028033dd2f94d4da1", null ],
-    [ "ref_session_open", "session_8php.html#a26fa1042356d555023cbf15ddd4f8507", null ],
-    [ "ref_session_read", "session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e", null ],
-    [ "ref_session_write", "session_8php.html#ac4461c1984543d3553e73dba2771568f", null ],
-    [ "$gc_probability", "session_8php.html#a96b09cc763572f45280786a7b33feb7e", null ],
-    [ "$session_exists", "session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb", null ],
-    [ "$session_expire", "session_8php.html#af0100a2642a5268594bbd5742a03d885", null ]
-];
\ No newline at end of file