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

diff --git a/doc/html/setup_8php.js b/doc/html/setup_8php.js
deleted file mode 100644
index e02d5899c..000000000
--- a/doc/html/setup_8php.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var setup_8php =
-[
-    [ "check_add", "setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1", null ],
-    [ "check_funcs", "setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e", null ],
-    [ "check_htaccess", "setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4", null ],
-    [ "check_htconfig", "setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f", null ],
-    [ "check_keys", "setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76", null ],
-    [ "check_php", "setup_8php.html#a14d208682a88632290c895d20da6e7d6", null ],
-    [ "check_smarty3", "setup_8php.html#afd8b0b3ade1507c45325caf377bf459d", null ],
-    [ "check_store", "setup_8php.html#ab4b71369a25021d59247c917e98d8246", null ],
-    [ "get_db_errno", "setup_8php.html#a8652788e8589778c5f81634a9d5b9429", null ],
-    [ "load_database", "setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a", null ],
-    [ "load_database_rem", "setup_8php.html#a2b375ddc555140236fc500135de99371", null ],
-    [ "manual_config", "setup_8php.html#abe405d227ba7232971964a706d4f3bce", null ],
-    [ "setup_content", "setup_8php.html#a88247384a96e14516f474d7af6a465c1", null ],
-    [ "setup_init", "setup_8php.html#a267555abd17290e659b4bf44b885e4e0", null ],
-    [ "setup_post", "setup_8php.html#a13cf286774149a0a7bd8adb8179cec75", null ],
-    [ "what_next", "setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58", null ],
-    [ "$install_wizard_pass", "setup_8php.html#addb24714bc2542aa4f4215e98fe48432", null ]
-];
\ No newline at end of file