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/comanche_8php.js b/doc/html/comanche_8php.js
deleted file mode 100644
index 51c7b52c6..000000000
--- a/doc/html/comanche_8php.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var comanche_8php =
-[
-    [ "comanche_block", "comanche_8php.html#a5a7ab801717d38e91ac910b933973887", null ],
-    [ "comanche_get_channel_id", "comanche_8php.html#aed39ecad69234f3ddf61f0dedb49a58e", null ],
-    [ "comanche_menu", "comanche_8php.html#ad5a44e42231759aba1dda49e0490501e", null ],
-    [ "comanche_parser", "comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922", null ],
-    [ "comanche_region", "comanche_8php.html#a5718daeda40bf835345fe061e8808cdf", null ],
-    [ "comanche_replace_region", "comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe", null ],
-    [ "comanche_webpage", "comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a", null ],
-    [ "comanche_widget", "comanche_8php.html#a6b0191c1a63db1696a2eb139d90d9e7f", null ],
-    [ "pdl_selector", "comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e", null ],
-    [ "register_page_template", "comanche_8php.html#a3d11417d2d846dbe72638a556529ff8f", null ]
-];
\ No newline at end of file