[commits] Horde branch develop updated. 65ec5109c5623ad296db28886378fa6b0c5a3a7f

[Jan Schneider]

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

from: 9a4af2ac729d68c2e15fe92c10caced86c066ee9

690e83f [jan] Fix removing filter (Bug #11043).
65ec510 Merge branch 'master' into develop

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

commit 690e83f3e90f05d7b4d6e4c7f0ad04f471950b64
Author: Jan Schneider <jan at horde.org>
Date:   Wed Mar 14 19:01:06 2012 +0100

    [jan] Fix removing filter (Bug #11043).

 gollem/docs/CHANGES |    1 +
 gollem/manager.php  |   22 ++++++++++++----------
 gollem/package.xml  |    2 ++
 3 files changed, 15 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/690e83f3e90f05d7b4d6e4c7f0ad04f471950b64

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

commit 65ec5109c5623ad296db28886378fa6b0c5a3a7f
Merge: 9a4af2a 690e83f
Author: Jan Schneider <jan at horde.org>
Date:   Wed Mar 14 20:12:24 2012 +0100

    Merge branch 'master' into develop
    
    Conflicts:
    	gollem/package.xml

 gollem/docs/CHANGES |    1 +
 gollem/manager.php  |   22 ++++++++++++----------
 gollem/package.xml  |   17 ++++++++++++++++-
 3 files changed, 29 insertions(+), 11 deletions(-)

http://git.horde.org/horde-git/-/commit/65ec5109c5623ad296db28886378fa6b0c5a3a7f