[commits] Horde branch master updated. 4dadb0df8201ba4fae3cfbcf2cfda44213fc2fda

[Jan Schneider]

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

from: 5cc4adc7df02c0f1945ba9cd02aba92ee29fe9c3

f9da011 Catch exception when setting resolv.conf, e.g. if resolv.conf is emtpy.
4dadb0d Enable homeAdress and workAddress composite fields by default.

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

commit f9da011969dd37bf54d5299b3051afb3fb09714d
Author: Jan Schneider <jan at horde.org>
Date:   Tue May 10 21:07:58 2011 +0200

    Catch exception when setting resolv.conf, e.g. if resolv.conf is emtpy.

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

http://git.horde.org/horde-git/-/commit/f9da011969dd37bf54d5299b3051afb3fb09714d

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

commit 4dadb0df8201ba4fae3cfbcf2cfda44213fc2fda
Author: Jan Schneider <jan at horde.org>
Date:   Wed May 11 11:36:17 2011 +0200

    Enable homeAdress and workAddress composite fields by default.
    
    It's easier to disable than to enable them in local configuration, and
    it enables the map feature by default.

 turba/config/backends.php |   25 +++++++++++++++----------
 turba/docs/CHANGES        |    1 +
 turba/package.xml         |    4 ++--
 3 files changed, 18 insertions(+), 12 deletions(-)

http://git.horde.org/horde-git/-/commit/4dadb0df8201ba4fae3cfbcf2cfda44213fc2fda