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

diff --git a/doc/html/apw_2php_2style_8php.js b/doc/html/apw_2php_2style_8php.js
deleted file mode 100644
index bfb5568d9..000000000
--- a/doc/html/apw_2php_2style_8php.js
+++ /dev/null
@@ -1,14 +0,0 @@
-var apw_2php_2style_8php =
-[
-    [ "$fext", "apw_2php_2style_8php.html#a404171b8f918c116e45a6421c92f0cc9", null ],
-    [ "$fname", "apw_2php_2style_8php.html#ab9e0f70d44ab67f4334f9883631777fc", null ],
-    [ "$iconsize", "apw_2php_2style_8php.html#a07adb491994deb72a00a975b431d3e30", null ],
-    [ "$navheight", "apw_2php_2style_8php.html#a1c8a7c0db8c174239f3909cb931cb872", null ],
-    [ "$obliquemacro", "apw_2php_2style_8php.html#a2cad82a3ecadbe58dbc4197de1c63da0", null ],
-    [ "$sectiontop", "apw_2php_2style_8php.html#acb0dedc3212a7c60ab2474768becd79a", null ],
-    [ "$showlock", "apw_2php_2style_8php.html#ad401ea1d1ba236f86863b4574f01e425", null ],
-    [ "$strongmacro", "apw_2php_2style_8php.html#aa58104ba36588bbf082cecbb3910e2ea", null ],
-    [ "$uid", "apw_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a", null ],
-    [ "$x", "apw_2php_2style_8php.html#af3a16c5f0dd7a74cf9acf6a49fff73a7", null ],
-    [ "if", "apw_2php_2style_8php.html#a2f71e817b8fac88ce7f0ec5c0fb88b8d", null ]
-];
\ No newline at end of file