[commits] Horde branch master updated. 26317df123c67dcc451d4e84bf0fa28aced074fe

[Jan Schneider]

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

from: 423b29e9ae9e6b4227f7d8870aa8a2b6d823f120

4eac1eb Fix listing more than one sub-permission (Bug #9671).
26317df Don't show sub-permissions for adding that exist already.

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

commit 4eac1ebf3d5938b0e0305a85872c8ccab23abf34
Author: Jan Schneider <jan at horde.org>
Date:   Thu Mar 17 18:21:34 2011 +0100

    Fix listing more than one sub-permission (Bug #9671).

 framework/Core/lib/Horde/Core/Perms.php |    5 +++--
 framework/Core/package.xml              |    1 +
 horde/docs/CHANGES                      |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

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

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

commit 26317df123c67dcc451d4e84bf0fa28aced074fe
Author: Jan Schneider <jan at horde.org>
Date:   Thu Mar 17 18:22:08 2011 +0100

    Don't show sub-permissions for adding that exist already.

 framework/Core/lib/Horde/Core/Perms/Ui.php |    7 +++++++
 framework/Core/package.xml                 |    1 +
 horde/docs/CHANGES                         |    1 +
 3 files changed, 9 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/26317df123c67dcc451d4e84bf0fa28aced074fe