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

diff --git a/doc/html/crypto_8php.js b/doc/html/crypto_8php.js
deleted file mode 100644
index dca2088c1..000000000
--- a/doc/html/crypto_8php.js
+++ /dev/null
@@ -1,27 +0,0 @@
-var crypto_8php =
-[
-    [ "AES256CBC_decrypt", "crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9", null ],
-    [ "AES256CBC_encrypt", "crypto_8php.html#a5c61821d205f95f127114159cbffa764", null ],
-    [ "aes_encapsulate", "crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286", null ],
-    [ "aes_unencapsulate", "crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914", null ],
-    [ "crypto_encapsulate", "crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c", null ],
-    [ "crypto_unencapsulate", "crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5", null ],
-    [ "DerToPem", "crypto_8php.html#a630e1574554f34e7c38511585d9e71a2", null ],
-    [ "DerToRsa", "crypto_8php.html#ae5af17db1cb5d7c91d486e1264079839", null ],
-    [ "metopem", "crypto_8php.html#af8bbdeaf4abed7b40365d301e6013c85", null ],
-    [ "metorsa", "crypto_8php.html#a573f02517abe4ac9241268263063b2a0", null ],
-    [ "new_keypair", "crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a", null ],
-    [ "pemtome", "crypto_8php.html#a798368843cdd9bb08386b48e53e29e8c", null ],
-    [ "pemtorsa", "crypto_8php.html#a35bc357c93f4ddc67ef377620b0349e8", null ],
-    [ "pkcs1_encode", "crypto_8php.html#a890b443f80f0968fb9eabd93fc99dbb5", null ],
-    [ "pkcs1to8", "crypto_8php.html#a4d15d19b446dbf47804675df7c85e2a9", null ],
-    [ "pkcs5_pad", "crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec", null ],
-    [ "pkcs5_unpad", "crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85", null ],
-    [ "pkcs8_encode", "crypto_8php.html#a0e941b6b18ff895d1a2448741abf2ef2", null ],
-    [ "pkcs8to1", "crypto_8php.html#a7427a18417341aa35e2207bfa205e432", null ],
-    [ "pubrsatome", "crypto_8php.html#a2a3fae7caca27f86d158eeaf69b6f287", null ],
-    [ "rsa_sign", "crypto_8php.html#a920e5f222d0020f47556033d8b2b6552", null ],
-    [ "rsa_verify", "crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96", null ],
-    [ "rsatopem", "crypto_8php.html#a7f7e650aaeaa3832580a73eb00966b26", null ],
-    [ "salmon_key", "crypto_8php.html#a9191447cc46f0b4eaba3273e313994d5", null ]
-];
\ No newline at end of file