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

diff --git a/doc/html/classphoto__driver.js b/doc/html/classphoto__driver.js
deleted file mode 100644
index 258b2eb60..000000000
--- a/doc/html/classphoto__driver.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var classphoto__driver =
-[
-    [ "__construct", "classphoto__driver.html#ac6e85f8e507cab4e755ed7acdec401ae", null ],
-    [ "__destruct", "classphoto__driver.html#ae4501abdc9651359f81d036b63625686", null ],
-    [ "cropImage", "classphoto__driver.html#a2e6e61f1e356a90bc978f4404a77137e", null ],
-    [ "destroy", "classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813", null ],
-    [ "doScaleImage", "classphoto__driver.html#ae18716018afcf362c7c24586b53e9e2f", null ],
-    [ "flip", "classphoto__driver.html#a2b2a99021fc63ed6465d703ddddcb832", null ],
-    [ "getExt", "classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba", null ],
-    [ "getHeight", "classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468", null ],
-    [ "getImage", "classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5", null ],
-    [ "getType", "classphoto__driver.html#a6c6c16dbc4f517ce799f9143ed61f0e3", null ],
-    [ "getWidth", "classphoto__driver.html#acc30486acee9e89e32701f44a1738117", null ],
-    [ "imageString", "classphoto__driver.html#abc9f73ad90923772d52b9fcc4eb117dd", null ],
-    [ "is_valid", "classphoto__driver.html#a97289aef3be43d9435ca3717ef10b8ab", null ],
-    [ "load", "classphoto__driver.html#a19e1af2b6af4c63aa6230abe69f83712", null ],
-    [ "orient", "classphoto__driver.html#a4de5bac8daea8f291a33c80788019d0d", null ],
-    [ "rotate", "classphoto__driver.html#a2f2b6337cf9aa0688d10b422123f0eec", null ],
-    [ "save", "classphoto__driver.html#a5864fae7d8389372955a8e78cec527ac", null ],
-    [ "saveImage", "classphoto__driver.html#a22ecb8c696de65a5a10bd185be9d90c3", null ],
-    [ "scaleImage", "classphoto__driver.html#af0f7ec48a31ae9b557b6e3f8bd5b4af0", null ],
-    [ "scaleImageSquare", "classphoto__driver.html#a56634842b071b96502716e9843ea5361", null ],
-    [ "scaleImageUp", "classphoto__driver.html#a1a63c4ae17e892a115ab9cf6efb960ce", null ],
-    [ "setDimensions", "classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143", null ],
-    [ "store", "classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b", null ],
-    [ "supportedTypes", "classphoto__driver.html#a6eee8e36eaf9339f4faf80ddd43162da", null ],
-    [ "$height", "classphoto__driver.html#aea560be5dfba09117d36c12bacbf3b80", null ],
-    [ "$image", "classphoto__driver.html#a7c78b5a01afe61ba3895ac07f4869b55", null ],
-    [ "$type", "classphoto__driver.html#a4920ed7cbb1ac735ac84153067537f03", null ],
-    [ "$types", "classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03", null ],
-    [ "$valid", "classphoto__driver.html#a01d28d43b404d6f6de219dc9c5069dc9", null ],
-    [ "$width", "classphoto__driver.html#a3e4215890f4a4894bf3799a7d2e0c0b1", null ]
-];
\ No newline at end of file