[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.6-288-g6ff278a

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  6ff278a0e63267e4a1581db55b569c457bc26b13 (commit)
       via  0214ede0861c3f3be1cbc648877b8674af125850 (commit)
       via  50654b16da094501550e4ee061312804c269115e (commit)
       via  446403b8a4f62e7e6634f8170ffe9e04b4e20ccb (commit)
       via  dfd4d0947b88ad02cda7e71af82f3360cfb2934d (commit)
       via  196910ff7b0e1ae89d27903834752c6ad3a3f22c (commit)
       via  c37332955f8d1cafc410669bbacde85544869785 (commit)
       via  9d716db635a9b7866b3cf16a4409001ca4eac9a1 (commit)
       via  8a34dc3b97551c341130863806c8f3454ad0b946 (commit)
       via  5229aeee60ed34b00c775e7f82c632ff8f9e7a3c (commit)
      from  397d27baedf7f250b21a40936df8b827374352d3 (commit)

Summary of changes:
 share/html/Elements/QueueSummaryByStatus        | 10 +++-
 share/html/REST/1.0/Forms/ticket/default        |  7 ---
 t/api/template-insert.t                         | 26 ---------
 t/api/{template-simple.t => template-parsing.t} | 77 +++++++++++++++----------
 t/api/template.t                                | 45 +++++++++------
 5 files changed, 80 insertions(+), 85 deletions(-)
 delete mode 100644 t/api/template-insert.t
 rename t/api/{template-simple.t => template-parsing.t} (79%)

- Log -----------------------------------------------------------------
commit 50654b16da094501550e4ee061312804c269115e
Merge: 397d27b 8a34dc3
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Aug 20 16:37:53 2012 -0400

    Merge branch '4.0/rest-drop-wrong-email-test' into 4.0-trunk


commit 0214ede0861c3f3be1cbc648877b8674af125850
Merge: 50654b1 5229aee
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Aug 20 16:38:10 2012 -0400

    Merge branch '4.0/same-query-in-both-queue-summary-by' into 4.0-trunk


commit 6ff278a0e63267e4a1581db55b569c457bc26b13
Merge: 0214ede 446403b
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Aug 20 16:38:23 2012 -0400

    Merge branch '4.0/template-tests' into 4.0-trunk


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