[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.8-204-g5b4458d

[Thomas Sibley]

The branch, 4.0-trunk has been updated
       via  5b4458d9096fa84dd977898dba1ba8dd53678d99 (commit)
       via  348f1b76a54d9212b0c310f388050746e6a1d143 (commit)
       via  1a7e87b7083a995c0040fd317e0ee65c4ac46ba6 (commit)
       via  c32d728a0f56d7a42e054e710c2abfd91d7230d2 (commit)
      from  449b19f6fbc6839c3c6e7564462d9c6ada4e0aed (commit)

Summary of changes:
 share/html/Admin/Elements/ModifyTemplate | 7 +++++--
 share/html/Admin/Global/Template.html    | 5 +++--
 share/html/Admin/Queues/Template.html    | 5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit 5b4458d9096fa84dd977898dba1ba8dd53678d99
Merge: 449b19f 348f1b7
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Nov 30 15:01:36 2012 -0800

    Merge branch '4.0/simple-template-permission' into 4.0-trunk

diff --cc share/html/Admin/Elements/ModifyTemplate
index ebe7c73,5746c06..5746c06
mode 100644,100755..100644
--- a/share/html/Admin/Elements/ModifyTemplate
+++ b/share/html/Admin/Elements/ModifyTemplate
diff --cc share/html/Admin/Global/Template.html
index 70b6905,be8501b..be8501b
mode 100644,100755..100644
--- a/share/html/Admin/Global/Template.html
+++ b/share/html/Admin/Global/Template.html
diff --cc share/html/Admin/Queues/Template.html
index 3dd99e1,a4c1950..a4c1950
mode 100644,100755..100644
--- a/share/html/Admin/Queues/Template.html
+++ b/share/html/Admin/Queues/Template.html

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