[commits] Horde branch master updated. 75657c76f8ea67ca56d588b7bd81f0dd38628131

[Jan Schneider]

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

from: f092e267aa8b7797c556762aadcd5716e46c9630

d6ed233 Revert "Implement modular cli and a config editing module (Request #12923)."
75657c7 [jan] Add mysql encryption option for SQL backends (Request #12962).

Summary: http://github.com/horde/horde/compare/f092e267aa8b7797c556762aadcd5716e46c9630...75657c76f8ea67ca56d588b7bd81f0dd38628131

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

commit d6ed233fa7d87e9858c8424a3d3923a1ac1afcf3
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 11 12:13:36 2014 +0100

    Revert "Implement modular cli and a config editing module (Request #12923)."
    
    This reverts commit a90e4c02a538981f772a45205c991d466f9d472a.
    
    Conflicts:
    	framework/Core/package.xml
    	horde/bin/horde-cli
    	horde/docs/CHANGES
    	horde/lib/AdminCli.php
    	horde/lib/AdminCli/Module/Base.php
    	horde/lib/AdminCli/Module/Config.php
    	horde/package.xml

 framework/Core/lib/Horde/Config.php  |   29 +-----
 framework/Core/package.xml           |    2 -
 horde/bin/horde-cli                  |   29 -----
 horde/docs/CHANGES                   |    1 -
 horde/lib/AdminCli.php               |   77 ------------
 horde/lib/AdminCli/Module/Base.php   |   94 --------------
 horde/lib/AdminCli/Module/Config.php |  221 ----------------------------------
 horde/package.xml                    |  221 +---------------------------------
 8 files changed, 2 insertions(+), 672 deletions(-)
 delete mode 100755 horde/bin/horde-cli
 delete mode 100644 horde/lib/AdminCli.php
 delete mode 100644 horde/lib/AdminCli/Module/Base.php
 delete mode 100644 horde/lib/AdminCli/Module/Config.php

http://github.com/horde/horde/commit/d6ed233fa7d87e9858c8424a3d3923a1ac1afcf3
http://git.horde.org/horde-git/-/commit/d6ed233fa7d87e9858c8424a3d3923a1ac1afcf3

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

commit 75657c76f8ea67ca56d588b7bd81f0dd38628131
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 11 12:17:32 2014 +0100

    [jan] Add mysql encryption option for SQL backends (Request #12962).

 horde/config/conf.xml |    2 ++
 horde/docs/CHANGES    |    1 +
 horde/package.xml     |    1 +
 3 files changed, 4 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/75657c76f8ea67ca56d588b7bd81f0dd38628131
http://git.horde.org/horde-git/-/commit/75657c76f8ea67ca56d588b7bd81f0dd38628131