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/language_8php.js b/doc/html/language_8php.js
deleted file mode 100644
index 23b8a292a..000000000
--- a/doc/html/language_8php.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var language_8php =
-[
-    [ "detect_language", "language_8php.html#a632da17c7ac0d2dc1a00a4706870194b", null ],
-    [ "get_best_language", "language_8php.html#a980dee1d8715a98ab02e36b59facf8ed", null ],
-    [ "get_browser_language", "language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e", null ],
-    [ "get_language_name", "language_8php.html#a43e6ddba9df019c9ac3ab4c94c444ae7", null ],
-    [ "load_translation_table", "language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05", null ],
-    [ "pop_lang", "language_8php.html#a78bd204955ec4cc3a9ac651285a1689d", null ],
-    [ "push_lang", "language_8php.html#ac9142ef1d01a235c760deb0f16643f5a", null ],
-    [ "string_plural_select_default", "language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0", null ],
-    [ "t", "language_8php.html#ac6ae482ee54fa2764d5c2e77305aeb96", null ],
-    [ "tt", "language_8php.html#a686bcafa6b0d5c86d37b38a1db5b6997", null ]
-];
\ No newline at end of file