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

diff --git a/doc/html/php2po_8php.js b/doc/html/php2po_8php.js
deleted file mode 100644
index 679a631af..000000000
--- a/doc/html/php2po_8php.js
+++ /dev/null
@@ -1,11 +0,0 @@
-var php2po_8php =
-[
-    [ "$infile", "php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214", null ],
-    [ "$ink", "php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0", null ],
-    [ "$k", "php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178", null ],
-    [ "$out", "php2po_8php.html#a48cb304902320d173a4eaa41543327b9", null ],
-    [ "$phpfile", "php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4", null ],
-    [ "$pofile", "php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1", null ],
-    [ "if", "php2po_8php.html#a45b05625748f412ec97afcd61cf7980b", null ],
-    [ "n", "php2po_8php.html#a1594a11499d06cc8a789ee7ca0c7a12b", null ]
-];
\ No newline at end of file