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/classFKOAuthDataStore.js b/doc/html/classFKOAuthDataStore.js
deleted file mode 100644
index 29825cdac..000000000
--- a/doc/html/classFKOAuthDataStore.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var classFKOAuthDataStore =
-[
-    [ "gen_token", "classFKOAuthDataStore.html#aa1a268be88ad3979bb4cc35bbb4dc819", null ],
-    [ "lookup_consumer", "classFKOAuthDataStore.html#a1148d47b546350bf440bdd92792c5df1", null ],
-    [ "lookup_nonce", "classFKOAuthDataStore.html#a4edfe2e77ecd2e16ff6b5eb516ed3599", null ],
-    [ "lookup_token", "classFKOAuthDataStore.html#a96f76387c3a93b0abe27a98013804bab", null ],
-    [ "new_access_token", "classFKOAuthDataStore.html#a434882f03e3cdb171ed89e09e337e934", null ],
-    [ "new_request_token", "classFKOAuthDataStore.html#a431b44d70e3da6a8256ab38f710e3050", null ]
-];
\ No newline at end of file