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

diff --git a/doc/html/socgraph_8php.js b/doc/html/socgraph_8php.js
deleted file mode 100644
index e059af540..000000000
--- a/doc/html/socgraph_8php.js
+++ /dev/null
@@ -1,13 +0,0 @@
-var socgraph_8php =
-[
-    [ "all_friends", "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586", null ],
-    [ "common_friends", "socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918", null ],
-    [ "common_friends_zcid", "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9", null ],
-    [ "count_all_friends", "socgraph_8php.html#af29d056beec10b4e38e5209c92452894", null ],
-    [ "count_common_friends", "socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84", null ],
-    [ "count_common_friends_zcid", "socgraph_8php.html#af175807406d94407a5e11742a3287746", null ],
-    [ "poco", "socgraph_8php.html#a2225cdc3651a0bea089b16cbfb6ddaf1", null ],
-    [ "poco_load", "socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6", null ],
-    [ "suggestion_query", "socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329", null ],
-    [ "update_suggestions", "socgraph_8php.html#a790690bb1a1d02483fe31632a160144d", null ]
-];
\ No newline at end of file