[commits] Horde branch develop updated. ea689184939c8d08be1f06f106d79d066792212c

[Michael M Slusarz]

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

from: 17228efaf1d45c6e10fd54d32567385f17244989

458ba44 Revert "[mms] Allow expiration date to be provided when creating personal PGP key (Request #5754)."
28e5848 Merge branch 'master' into develop
ea68918 [mms] Allow expiration date to be provided when creating personal PGP key (Request #5754).

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

commit 458ba44d19262e59cfa727a7a6accdd946884bc6
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Dec 6 11:40:59 2011 -0700

    Revert "[mms] Allow expiration date to be provided when creating personal PGP key (Request #5754)."
    
    This reverts commit f76b7572faa4b736f5781febed7b1b4fb5f0abc3.
    
    Conflicts:
    
    	imp/docs/CHANGES
    	imp/package.xml
    
    Moved to 5.1

 imp/docs/CHANGES                       |    2 -
 imp/js/pgp.js                          |   61 --------------------------------
 imp/lib/Crypt/Pgp.php                  |   16 ++++-----
 imp/lib/Prefs/Ui.php                   |   13 +------
 imp/package.xml                        |    4 +--
 imp/templates/prefs/pgpprivatekey.html |   16 --------
 6 files changed, 9 insertions(+), 103 deletions(-)
 delete mode 100644 imp/js/pgp.js

http://git.horde.org/horde-git/-/commit/458ba44d19262e59cfa727a7a6accdd946884bc6

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

commit 28e58483d53b9694f19bd8e61579b37ab9ff3e51
Merge: 17228ef 458ba44
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Dec 6 11:41:59 2011 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/package.xml

 imp/js/pgp.js                          |   61 --------------------------------
 imp/lib/Crypt/Pgp.php                  |   16 ++++-----
 imp/lib/Prefs/Ui.php                   |   13 +------
 imp/package.xml                        |    2 +-
 imp/templates/prefs/pgpprivatekey.html |   16 --------
 5 files changed, 9 insertions(+), 99 deletions(-)

http://git.horde.org/horde-git/-/commit/28e58483d53b9694f19bd8e61579b37ab9ff3e51

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

commit ea689184939c8d08be1f06f106d79d066792212c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Mon Dec 5 17:04:22 2011 -0700

    [mms] Allow expiration date to be provided when creating personal PGP key (Request #5754).
    
    Conflicts:
    
    	imp/docs/CHANGES
    	imp/package.xml

 imp/js/pgp.js                          |   61 ++++++++++++++++++++++++++++++++
 imp/lib/Crypt/Pgp.php                  |   16 +++++----
 imp/lib/Prefs/Ui.php                   |   13 ++++++-
 imp/package.xml                        |    2 +-
 imp/templates/prefs/pgpprivatekey.html |   16 ++++++++
 5 files changed, 99 insertions(+), 9 deletions(-)
 create mode 100644 imp/js/pgp.js

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