[commits] Horde branch master updated. c561ddb16314fec7848268aefe273e5ad54428d9

[Jan Schneider]

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

from: 3c8753bb47c21945b0384fb203cd7a6fef787d1d

092f6c6 Require Horde_Mail 2.5.0.
c561ddb [jan] Add show_encryption setting to HTTP authentication configuration (Jasper.Olbrich at students.uni-marburg.de, Bug #13444).

Summary: http://github.com/horde/horde/compare/3c8753bb47c21945b0384fb203cd7a6fef787d1d...c561ddb16314fec7848268aefe273e5ad54428d9

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

commit 092f6c681a26c34aecb4c9c54120042fd3429858
Author: Jan Schneider <jan at horde.org>
Date:   Mon Aug 18 17:15:02 2014 +0200

    Require Horde_Mail 2.5.0.

 imp/package.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/092f6c681a26c34aecb4c9c54120042fd3429858

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

commit c561ddb16314fec7848268aefe273e5ad54428d9
Author: Jan Schneider <jan at horde.org>
Date:   Mon Aug 18 22:39:08 2014 +0200

    [jan] Add show_encryption setting to HTTP authentication configuration (Jasper.Olbrich at students.uni-marburg.de, Bug #13444).
    
    Conflicts:
    	horde/docs/CHANGES
    	horde/package.xml

 horde/config/conf.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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