[commits] Horde branch master updated. e7ef55de809ac552540e9017c6b48fd595c20e13

[Jan Schneider]

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

from: 4c1a6162228a5719abf8163b58afb5476bdadc9a

9ac668a Revert "Ensure hooks are called on imported values too."
05f2ac1 [jan] Fix importing contacts with composite fields.
e7ef55d Fix changelogs.

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

commit 9ac668a221e8229e11db8f018974cd51ba15a354
Author: Jan Schneider <jan at horde.org>
Date:   Mon Oct 24 12:18:59 2011 +0200

    Revert "Ensure hooks are called on imported values too."
    
    This breaks importing any composite fields, most noteable name fields when
    adding contacts from IMP, because setValue() only works on "real" attributes.
    Calling encode hooks needs to be solved differently.
    
    This reverts commit e908bd92dc8e07852f1fecbd93ce983416ec493c.
    
    Conflicts:
    
    	turba/lib/Api.php

 turba/lib/Api.php |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/9ac668a221e8229e11db8f018974cd51ba15a354

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

commit 05f2ac1b2bdfcff2a0aa16ea2636c0c49c5b2324
Author: Jan Schneider <jan at horde.org>
Date:   Mon Oct 24 12:21:46 2011 +0200

    [jan] Fix importing contacts with composite fields.

 turba/docs/CHANGES |    1 +
 turba/package.xml  |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/05f2ac1b2bdfcff2a0aa16ea2636c0c49c5b2324

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

commit e7ef55de809ac552540e9017c6b48fd595c20e13
Author: Jan Schneider <jan at horde.org>
Date:   Mon Oct 24 12:23:32 2011 +0200

    Fix changelogs.

 turba/docs/CHANGES |    7 +++----
 turba/package.xml  |    6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

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