[commits] Horde branch master updated. 2b36cff2351e8e6979b1e593bf5ca69e872a532b

[Michael M Slusarz]

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

from: 6fb5ebed4b51c91b1d3a411b7295edf009803d44

25d0c95 fix english
2b36cff Ignore packages if we can't read them to prevent fatal error (Bug #13398)

Summary: http://github.com/horde/horde/compare/6fb5ebed4b51c91b1d3a411b7295edf009803d44...2b36cff2351e8e6979b1e593bf5ca69e872a532b

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

commit 25d0c9575a1b3eba7a2a19206d523b0d4077c263
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jul 25 12:20:09 2014 -0600

    fix english

 horde/templates/data/csvmap.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/25d0c9575a1b3eba7a2a19206d523b0d4077c263

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

commit 2b36cff2351e8e6979b1e593bf5ca69e872a532b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jul 25 12:23:38 2014 -0600

    Ignore packages if we can't read them to prevent fatal error (Bug #13398)

 horde/admin/config/index.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/2b36cff2351e8e6979b1e593bf5ca69e872a532b