[commits] Horde branch master updated. 44703676def53856a6875ea4960d32eef09b2035

[Gunnar Wrobel]

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

from: 3e25ca98820e54bebfc16801f5f5ab56cedcc6dd

bfc9364 Read the "conflicts" value.
4470367 Ensure conflicting packages do not get interpreted as dependency.

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

commit bfc9364f2aa0f41b177956d9fb5e946418660575
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Jul 8 06:44:41 2011 +0200

    Read the "conflicts" value.

 framework/Pear/lib/Horde/Pear/Package/Xml.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

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

commit 44703676def53856a6875ea4960d32eef09b2035
Author: Gunnar Wrobel <p at rdus.de>
Date:   Fri Jul 8 06:45:01 2011 +0200

    Ensure conflicting packages do not get interpreted as dependency.

 framework/Pear/lib/Horde/Pear/Package/Dependencies.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/44703676def53856a6875ea4960d32eef09b2035