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

diff --git a/doc/html/globals_dup.js b/doc/html/globals_dup.js
deleted file mode 100644
index eda3c25df..000000000
--- a/doc/html/globals_dup.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var globals_dup =
-[
-    [ "$", "globals.html", null ],
-    [ "_", "globals_0x5f.html", null ],
-    [ "a", "globals_0x61.html", null ],
-    [ "b", "globals_0x62.html", null ],
-    [ "c", "globals_0x63.html", null ],
-    [ "d", "globals_0x64.html", null ],
-    [ "e", "globals_0x65.html", null ],
-    [ "f", "globals_0x66.html", null ],
-    [ "g", "globals_0x67.html", null ],
-    [ "h", "globals_0x68.html", null ],
-    [ "i", "globals_0x69.html", null ],
-    [ "j", "globals_0x6a.html", null ],
-    [ "k", "globals_0x6b.html", null ],
-    [ "l", "globals_0x6c.html", null ],
-    [ "m", "globals_0x6d.html", null ],
-    [ "n", "globals_0x6e.html", null ],
-    [ "o", "globals_0x6f.html", null ],
-    [ "p", "globals_0x70.html", null ],
-    [ "q", "globals_0x71.html", null ],
-    [ "r", "globals_0x72.html", null ],
-    [ "s", "globals_0x73.html", null ],
-    [ "t", "globals_0x74.html", null ],
-    [ "u", "globals_0x75.html", null ],
-    [ "v", "globals_0x76.html", null ],
-    [ "w", "globals_0x77.html", null ],
-    [ "x", "globals_0x78.html", null ],
-    [ "y", "globals_0x79.html", null ],
-    [ "z", "globals_0x7a.html", null ]
-];
\ No newline at end of file