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

diff --git a/doc/html/account_8php.js b/doc/html/account_8php.js
deleted file mode 100644
index 51e0efde2..000000000
--- a/doc/html/account_8php.js
+++ /dev/null
@@ -1,23 +0,0 @@
-var account_8php =
-[
-    [ "account_service_class_allows", "account_8php.html#ac70e1d198246b029a3cedb7d6f7868bd", null ],
-    [ "account_service_class_fetch", "account_8php.html#a4328c40ee4b3d68630cf1ebb7b9d4d89", null ],
-    [ "account_total", "account_8php.html#a43e3042b2723d76915a030bac3c668b6", null ],
-    [ "check_account_admin", "account_8php.html#a917d74aad0baf3e0c4b51cf1051e654f", null ],
-    [ "check_account_email", "account_8php.html#ae052bd5558847bd38e89c213561a9771", null ],
-    [ "check_account_invite", "account_8php.html#aaff7720423417a4333697894ffd9ddeb", null ],
-    [ "check_account_password", "account_8php.html#a144b4891022567668375b58ea61cfff0", null ],
-    [ "create_account", "account_8php.html#a141fe579c351c78209d425473f978eb5", null ],
-    [ "downgrade_accounts", "account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9", null ],
-    [ "send_reg_approval_email", "account_8php.html#a014de2d5d5c9785de5bf547a485822fa", null ],
-    [ "send_verification_email", "account_8php.html#aa9c29c497c17d8f9344dce8631ad8761", null ],
-    [ "service_class_allows", "account_8php.html#a030cec6793b909c439c0336ba39b1571", null ],
-    [ "service_class_fetch", "account_8php.html#a905b54e10704b283ac64680a8abc0971", null ],
-    [ "upgrade_bool_message", "account_8php.html#a754d7f53b3abc557b753c057dc4e021d", null ],
-    [ "upgrade_link", "account_8php.html#a4fc13e528367f510fcb6d8bbfc559040", null ],
-    [ "upgrade_message", "account_8php.html#a901657dd078e070516cf97285e0bada7", null ],
-    [ "user_allow", "account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1", null ],
-    [ "user_approve", "account_8php.html#ad07be417ac7eda939768804106ddea3d", null ],
-    [ "user_deny", "account_8php.html#ac1653efba62493b9d87513e1b6c04c83", null ],
-    [ "verify_email_address", "account_8php.html#acd6b8d2124ba5ea4f4794d2c58ae8bf5", null ]
-];
\ No newline at end of file