[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.10-85-g4eb6706

[Jesse Vincent]

The branch, 4.2-trunk has been updated
       via  4eb670620becb7180bc99192086b26d1a04353ec (commit)
       via  da9242c140450448f7f4768e43430652b6e5de05 (commit)
       via  d4f4945f2124a33efeb0fbb9e3b6031d95f49c1c (commit)
      from  dbef526331f1e3548773f658ea0d50389fb800fd (commit)

Summary of changes:
 share/html/Admin/Global/Template.html | 56 ++++++++++++++++++-----------------
 share/html/Admin/Queues/Template.html | 10 +++----
 2 files changed, 34 insertions(+), 32 deletions(-)

- Log -----------------------------------------------------------------
commit 4eb670620becb7180bc99192086b26d1a04353ec
Merge: dbef526 da9242c
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Tue Mar 3 23:41:03 2015 -0800

    Merge branch '4.2/template-abort' into 4.2-trunk
    
    * 4.2/template-abort:
      Recover gracefully on template creation failure
      Standardize global template logic with queue template logic


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