[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.10-92-g75b4fcd

[Jesse Vincent]

The branch, 4.2-trunk has been updated
       via  75b4fcd58161add76a2882f3e3cc958dbb195641 (commit)
       via  9805ea67ea1625dca310676e76ec55e2bb0ac464 (commit)
       via  74b62c59ade5ee5c8256dbb3d3b814eb665156b2 (commit)
      from  facbe67ed3e828f8badafa031105a648c85662c0 (commit)

Summary of changes:
 lib/RT/Crypt.pm                                  | 4 ++++
 lib/RT/Crypt/GnuPG.pm                            | 7 +++++++
 lib/RT/Crypt/SMIME.pm                            | 3 +++
 lib/RT/User.pm                                   | 4 ++--
 share/html/Admin/Elements/ShowKeyInfo            | 2 +-
 share/html/Elements/Crypt/SelectKeyForEncryption | 4 ++--
 6 files changed, 19 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 75b4fcd58161add76a2882f3e3cc958dbb195641
Merge: facbe67 9805ea6
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Mar 4 00:26:58 2015 -0800

    Merge branch '4.2/crypt-key-format' into 4.2-trunk
    
    * 4.2/crypt-key-format:
      Provide a user-legible representation of the user's key
      Drop the "id" attribute of keys, which we never set


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