Merge branch '0.9.x' into 1.0.x

Conflicts:
	classes/Memcached_DataObject.php

diff --cc EVENTS.txt
Simple merge

diff --cc actions/showstream.php
Simple merge

diff --cc classes/Memcached_DataObject.php
index 27bb5d3c9d6e32f58063f9e1320b5daa711d123f,eb5d2627f27efc664d45ff530305334dd19cc4ae..f71bfd3da055530a03855514d4c687ac3664ec3e
--- 1/classes/Memcached_DataObject.php
--- 2/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@@ -338,11 -338,10 +338,15 @@@ class Memcached_DataObject extends Safe
          }
  
          $start = microtime(true);
-         try {
-             $result = parent::_query($string);
-         } catch (Exception $e) {
-             $fail = $e;
 +        $fail = false;
 -            $result = parent::_query($string);
+         $result = null;
+         if (Event::handle('StartDBQuery', array($this, $string, &$result))) {
++            try {
++                $result = parent::_query($string);
++            } catch (Exception $e) {
++                $fail = $e;
++            }
+             Event::handle('EndDBQuery', array($this, $string, &$result));
          }
          $delta = microtime(true) - $start;
  

diff --cc classes/Notice.php
Simple merge

diff --cc classes/Notice_tag.php
Simple merge

diff --cc classes/Profile.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc db/statusnet.sql
Simple merge

diff --cc lib/router.php
Simple merge

diff --cc plugins/LdapCommon/LdapCommon.php
Simple merge