[commits] Horde branch FRAMEWORK_5_0 updated. e7ede3782d1fac4b4ac85641babbc6ee5a077a29

[Jan Schneider]

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

from: 3a39828e8951d51dc238f38de68503a5a390efda

58c0a95 Fix importing phone fields that have additional attribute parameters (Bug #12178).
e7ede37 BFN

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

commit 58c0a95ec48b937f03c9cdd794db416f48d71b73
Author: Jan Schneider <jan at horde.org>
Date:   Fri Apr 19 21:41:48 2013 +0200

    Fix importing phone fields that have additional attribute parameters (Bug #12178).
    
    Conflicts:
    	turba/test/Turba/Unit/ImportTest.php

 turba/lib/Driver.php |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/58c0a95ec48b937f03c9cdd794db416f48d71b73

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

commit e7ede3782d1fac4b4ac85641babbc6ee5a077a29
Author: Jan Schneider <jan at horde.org>
Date:   Fri Apr 19 21:47:39 2013 +0200

    BFN

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

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