[commits] Horde branch develop updated. 076a3f7e7a276058dc5e4d1a972a80ead7dcf2af

[Jan Schneider]

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

from: 51f6656c5fb63092d68b0efc0e9c6d307d8d30e1

958d00d [mms] Fix patch for filtering on combination fields (Bug #11197).
4e3a99a Prepare release.
a1a5af4 Released ingo-2.0.9
9a83253 Development mode for ingo-2.0.10
08c699f Prepare release.
4764bca Released imp-5.0.22
f4973e2 Development mode for imp-5.0.23
076a3f7 Merge remote-tracking branch 'origin/master' into develop

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

commit 958d00d4fdbe5221594c6c574ff9a1988d223bbf
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 26 11:59:54 2012 +0200

    [mms] Fix patch for filtering on combination fields (Bug #11197).

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

http://git.horde.org/horde-git/-/commit/958d00d4fdbe5221594c6c574ff9a1988d223bbf

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

commit 4e3a99a0a59d5b64c417822c6337d860edba56a2
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 26 12:02:57 2012 +0200

    Prepare release.

 ingo/docs/RELEASE_NOTES |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

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

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

commit a1a5af4b2886917af014d7c0ea23cb86d64d18ea
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 26 12:04:08 2012 +0200

    Released ingo-2.0.9

 ingo/docs/CHANGES        |    6 +++---
 ingo/lib/Application.php |    2 +-
 ingo/package.xml         |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

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

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

commit 9a83253bfc1ea2b445b9c4fae5d1b53da8202eab
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 26 12:04:17 2012 +0200

    Development mode for ingo-2.0.10

 ingo/docs/CHANGES        |    6 ++++++
 ingo/lib/Application.php |    2 +-
 ingo/package.xml         |   21 ++++++++++++++++-----
 3 files changed, 23 insertions(+), 6 deletions(-)

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

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

commit 08c699f744b6d2be1a5f3a2ba7203f4631b4c5dc
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 26 13:30:01 2012 +0200

    Prepare release.

 imp/docs/CHANGES       |    2 +-
 imp/docs/RELEASE_NOTES |   26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

http://git.horde.org/horde-git/-/commit/08c699f744b6d2be1a5f3a2ba7203f4631b4c5dc

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

commit 4764bca74481622b39dd1d9b81d62882128255b3
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 26 13:31:53 2012 +0200

    Released imp-5.0.22

 imp/docs/CHANGES        |    6 +++---
 imp/lib/Application.php |    2 +-
 imp/package.xml         |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

http://git.horde.org/horde-git/-/commit/4764bca74481622b39dd1d9b81d62882128255b3

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

commit f4973e2d388b4a7b4057eefad2e4b54e7cfd4b3b
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 26 13:32:02 2012 +0200

    Development mode for imp-5.0.23

 imp/docs/CHANGES        |    6 ++++++
 imp/lib/Application.php |    2 +-
 imp/package.xml         |   22 ++++++++++++++++------
 3 files changed, 23 insertions(+), 7 deletions(-)

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

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

commit 076a3f7e7a276058dc5e4d1a972a80ead7dcf2af
Merge: 51f6656 f4973e2
Author: Jan Schneider <jan at horde.org>
Date:   Tue Jun 26 16:15:45 2012 +0200

    Merge remote-tracking branch 'origin/master' into develop
    
    Conflicts:
    	imp/lib/Application.php
    	imp/package.xml
    	ingo/docs/CHANGES
    	ingo/lib/Application.php
    	ingo/package.xml

 imp/docs/CHANGES        |   10 ++++++++--
 imp/docs/RELEASE_NOTES  |   26 +++++++++++++-------------
 imp/package.xml         |   15 ++++++++++++++-
 ingo/docs/CHANGES       |   13 ++++++++++---
 ingo/docs/RELEASE_NOTES |   18 +++++++++---------
 ingo/package.xml        |   16 +++++++++++++++-
 6 files changed, 69 insertions(+), 29 deletions(-)

http://git.horde.org/horde-git/-/commit/076a3f7e7a276058dc5e4d1a972a80ead7dcf2af