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, 1 insertions, 1 deletions

diff --git a/library/openid/provider/provider.php b/library/openid/provider/provider.php
index 03fbe1c81..a1a98d70b 100644
--- a/library/openid/provider/provider.php
+++ b/library/openid/provider/provider.php
@@ -21,7 +21,7 @@
  * @copyright Copyright (c) 2010, Mewp
  * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
-ini_set('error_log','log');
+//ini_set('error_log','log');
 abstract class LightOpenIDProvider
 {
     # URL-s to XRDS and server location.