[commits] Horde branch master updated. 6edddc7db506694cb48408068341b315b9db9403

[Chuck Hagenbuch]

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

from: e85f0babd139000dec0bf02d915f6ca9f24146a6

6edddc7 Not sure if this is the best fix, but also ignore kolab/config/horde.local.php

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

commit 6edddc7db506694cb48408068341b315b9db9403
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Sat Apr 9 11:30:07 2011 -0400

    Not sure if this is the best fix, but also ignore kolab/config/horde.local.php

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/6edddc7db506694cb48408068341b315b9db9403