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

diff --git a/doc/html/datetime_8php.js b/doc/html/datetime_8php.js
deleted file mode 100644
index 5265b77a1..000000000
--- a/doc/html/datetime_8php.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var datetime_8php =
-[
-    [ "age", "datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df", null ],
-    [ "cal", "datetime_8php.html#aea356409ba69f9de412298c998595dd2", null ],
-    [ "datesel", "datetime_8php.html#a77bb385ae8a9e7ca663309c102c0d766", null ],
-    [ "datetime_convert", "datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226", null ],
-    [ "datetimesel", "datetime_8php.html#a6732f99377eb2b57e643e3b7b3ba17b7", null ],
-    [ "dob", "datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8", null ],
-    [ "get_dim", "datetime_8php.html#a7df24d72ea05922d3127363e2295174c", null ],
-    [ "get_first_dim", "datetime_8php.html#aba971b67f17fecf050813f1eba72367f", null ],
-    [ "get_timezones", "datetime_8php.html#afbb34604d0f6e7d2103da4f42e2487b1", null ],
-    [ "relative_date", "datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82", null ],
-    [ "timesel", "datetime_8php.html#a3f239f94e23335d860b148958d87a093", null ],
-    [ "timezone_cmp", "datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865", null ],
-    [ "update_birthdays", "datetime_8php.html#af1cd77c97c901d9239cb7a61f97f9826", null ],
-    [ "z_birthday", "datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f", null ]
-];
\ No newline at end of file