[Rt-commit] [rtir] 01/01: Merge branch '3.0-trunk'

[Kevin Falcone]

This is an automated email from the git hooks/post-receive script.

falcone pushed a commit to branch master
in repository rtir.

commit c96367a2b4f28916cf8ee42cb777366bb51e58ac
Merge: af94ff2 6ac5f7b
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Wed Apr 9 17:25:44 2014 -0400

    Merge branch '3.0-trunk'
    
    Conflicts:
    	META.yml
    	lib/RT/IR.pm

 docs/UPGRADING-3.0                                 | 24 ++++++++++++++++++++--
 etc/add_constituency.in                            | 23 +++++++++++++--------
 .../Filter => QueueSummaryByLifecycle/SQLFilter}   | 11 ++++++----
 .../Filter => QueueSummaryByStatus/SQLFilter}      | 10 +--------
 html/RTIR/Tools/ScriptedAction.html                | 14 ++++---------
 lib/RT/IR.pm                                       | 16 +++++++++++++++
 6 files changed, 64 insertions(+), 34 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.