Merge branch '2014.11' into 2014.11-develop

diff --cc tests/tine20/TestCase.php
index 3f9b175,9f7f1f2..30470d4
--- 1/tests/tine20/TestCase.php
--- 2/tests/tine20/TestCase.php
+++ b/tests/tine20/TestCase.php
@@@ -118,10 -111,17 +118,20 @@@ abstract class TestCase extends PHPUnit
              Tinebase_Core::set(Tinebase_Core::USER, $this->_originalTestUser);
          }
          
 +        if ($this->_invalidateRolesCache) {
 +            Tinebase_Acl_Roles::getInstance()->resetClassCache();
 +        }
          Tinebase_Cache_PerRequest::getInstance()->resetCache();
+ 
+ 
+     }
+ 
+     /**
+      * tear down after test class
+      */
+     public static function tearDownAfterClass()
+     {
+         Tinebase_Core::getDbProfiling();
      }
      
      /**

diff --cc tine20/Tinebase/Container.php
Simple merge