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

diff --git a/doc/html/expire_8php.js b/doc/html/expire_8php.js
deleted file mode 100644
index 6ecd16ffe..000000000
--- a/doc/html/expire_8php.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var expire_8php =
-[
-    [ "expire_run", "expire_8php.html#a444e45c9b67727b27db4c779fd51a298", null ]
-];
\ No newline at end of file