[commits] Horde branch master updated. b1eb2684b42602aada21d6c388331f30d8659c6d

[Jan Schneider]

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

from: a5f61b0c7f57ee5c5d3e59c0c8bf827008a2b69d

34647e6 [jan] Fix loading of configuration screen with basedir restrictions or libxml entity loading disabled (Bug #13025).
b1eb268 [jan] Fix loading of local files with basedir restrictions or libxml entity loading disabled.

Summary: http://github.com/horde/horde/compare/a5f61b0c7f57ee5c5d3e59c0c8bf827008a2b69d...b1eb2684b42602aada21d6c388331f30d8659c6d

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

commit 34647e69d81cc6c0a77060dbcaaf4b05caca7397
Author: Jan Schneider <jan at horde.org>
Date:   Mon Mar 24 12:32:43 2014 +0100

    [jan] Fix loading of configuration screen with basedir restrictions or libxml entity loading disabled (Bug #13025).

 framework/Core/lib/Horde/Config.php |    2 +-
 framework/Core/package.xml          |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/34647e69d81cc6c0a77060dbcaaf4b05caca7397

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

commit b1eb2684b42602aada21d6c388331f30d8659c6d
Author: Jan Schneider <jan at horde.org>
Date:   Mon Mar 24 12:34:22 2014 +0100

    [jan] Fix loading of local files with basedir restrictions or libxml entity loading disabled.

 framework/Feed/lib/Horde/Feed.php |    2 +-
 framework/Feed/package.xml        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/b1eb2684b42602aada21d6c388331f30d8659c6d