[commits] Horde branch master updated. 36d6b15ed07b8f080ea19f44e0e624a392953e8b

[Jan Schneider]

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

from: 99ca260f16978140ef5af7b7fc63a5f70fccd7b6

202c739 OX doesn't return strict JSON, adapt for json extensions that are strict.
a0fac02 Set default shares.
36d6b15 [jan] Add script to import user preferences from Open-Xchange.

Summary: http://github.com/horde/horde/compare/99ca260f16978140ef5af7b7fc63a5f70fccd7b6...36d6b15ed07b8f080ea19f44e0e624a392953e8b

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

commit 202c7393d1a36959c873f59893188a0f7abbee18
Author: Jan Schneider <jan at horde.org>
Date:   Mon Mar 24 09:27:14 2014 +0100

    OX doesn't return strict JSON, adapt for json extensions that are strict.

 framework/OpenXchange/lib/Horde/OpenXchange/Base.php |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/202c7393d1a36959c873f59893188a0f7abbee18

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

commit a0fac025a2fee8788735338b73d53eab75373795
Author: Jan Schneider <jan at horde.org>
Date:   Mon Mar 24 09:27:44 2014 +0100

    Set default shares.

 kronolith/bin/kronolith-import-openxchange |    5 +++++
 nag/bin/nag-import-openxchange             |    5 +++++
 turba/bin/turba-import-openxchange         |    8 ++++++--
 3 files changed, 16 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/a0fac025a2fee8788735338b73d53eab75373795

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

commit 36d6b15ed07b8f080ea19f44e0e624a392953e8b
Author: Jan Schneider <jan at horde.org>
Date:   Mon Mar 24 09:31:40 2014 +0100

    [jan] Add script to import user preferences from Open-Xchange.

 horde/bin/horde-import-openxchange-prefs |  169 ++++++++++++++++++++++++++++++
 horde/docs/CHANGES                       |    1 +
 horde/package.xml                        |    5 +-
 3 files changed, 174 insertions(+), 1 deletions(-)
 create mode 100755 horde/bin/horde-import-openxchange-prefs

http://github.com/horde/horde/commit/36d6b15ed07b8f080ea19f44e0e624a392953e8b