[commits] Horde branch master updated. 185aed44ff868d26c85fd0437a96922d25a75d36

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: 7720de352ab0bcb8ddfdaf5ac2f54f09e092efd6

438ccf8 Revert "Remove 'read' and 'write_db' from DSN. We should probably better use separate"
185aed4 Unset options that Horde_Db doesn't know here.

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

commit 438ccf8cdefa790b844f22a13ba6a1a7bc8f1a39
Author: Jan Schneider <jan at horde.org>
Date:   Tue Sep 21 16:02:15 2010 +0200

    Revert "Remove 'read' and 'write_db' from DSN. We should probably better use separate"
    
    This reverts commit e4bda381d8b4ee972a9427dac535c79af1aa797a.
    
    Conflicts:
    
    	crumb/locale

 framework/Db/lib/Horde/Db/Adapter/Pdo/Mysql.php |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/framework/Db/lib/Horde/Db/Adapter/Pdo/Mysql.php?rt=horde-git&r1=e4bda381d8b4ee972a9427dac535c79af1aa797a&r2=438ccf8cdefa790b844f22a13ba6a1a7bc8f1a39

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

commit 185aed44ff868d26c85fd0437a96922d25a75d36
Author: Jan Schneider <jan at horde.org>
Date:   Tue Sep 21 16:05:26 2010 +0200

    Unset options that Horde_Db doesn't know here.

 framework/Core/lib/Horde/Core/Factory/Db.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Factory/Db.php?rt=horde-git&r1=fb8207ce940d5a65d58f8cc79ff9d0db2c995174&r2=185aed44ff868d26c85fd0437a96922d25a75d36