[commits] Horde branch develop updated. 6bb18f2ea575297e9f5b094cfa9fa9c1bf811ea0

[Jan Schneider]

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

from: 669d02524409d0405adac1c16f0d7ababf4eaf73

9611207 Fix botched merges.
6bb18f2 Catch broken <install> items.

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

commit 9611207f3688474bea6648a109d53ad22195e687
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jun 18 15:06:41 2012 +0200

    Fix botched merges.

 horde/package.xml     |    8 ++++++-
 imp/package.xml       |   56 ++++++++++++++++++++++++++++++++++++++++++++++++-
 ingo/package.xml      |    4 ++-
 kronolith/package.xml |   15 +++++++++++-
 nag/package.xml       |    2 +-
 turba/package.xml     |    3 +-
 whups/package.xml     |    5 +--
 7 files changed, 83 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/9611207f3688474bea6648a109d53ad22195e687

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

commit 6bb18f2ea575297e9f5b094cfa9fa9c1bf811ea0
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jun 18 14:47:59 2012 +0200

    Catch broken <install> items.

 framework/bin/install_framework |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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