[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.1-156-g6a69d0a

[Kevin Falcone]

The branch, 4.2-trunk has been updated
       via  6a69d0a2f6f26583cf220160e3971b57920bdcc6 (commit)
       via  254e8da98a2025ab3de31e751091bd048e3a0987 (commit)
      from  4b10d50f414aa6682e784048d34bb82042bb9734 (commit)

Summary of changes:
 lib/RT/Interface/Email.pm | 36 ++++++++++++++++++++++--------------
 lib/RT/Template.pm        | 13 ++++++++-----
 t/mail/html-outgoing.t    | 26 +++++++++++++++++++++++++-
 3 files changed, 55 insertions(+), 20 deletions(-)

- Log -----------------------------------------------------------------
commit 6a69d0a2f6f26583cf220160e3971b57920bdcc6
Merge: 4b10d50 254e8da
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Jan 3 11:56:27 2014 -0500

    Merge branch '4.2/html-content-safety' into 4.2-trunk


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