merged branch havvg/master (PR #3588)

Commits
-------

235be43 fix PropelLogger stopwatch events

Discussion
----------

fix PropelLogger "Event Propel Query X is not started."

---------------------------------------------------------------------------

by willdurand at 2012-03-13T16:00:39Z

👍

src/Symfony/Bridge/Propel1/Logger/PropelLogger.php

@@ -145,6 +145,7 @@ class PropelLogger
 
                 $add = false;
             } elseif ($this->isPrepared) {
+                $this->isPrepared = false;
                 $this->stopwatch->stop($watch);
             }
         }