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

diff --git a/doc/html/updatetpl_8py.js b/doc/html/updatetpl_8py.js
deleted file mode 100644
index 38f8a5299..000000000
--- a/doc/html/updatetpl_8py.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var updatetpl_8py =
-[
-    [ "help", "updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f", null ],
-    [ "excludepaths", "updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94", null ],
-    [ "fnull", "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3", null ],
-    [ "names", "updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6", null ],
-    [ "path", "updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6", null ],
-    [ "tplpaths", "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12", null ]
-];
\ No newline at end of file