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

[Kevin Falcone]

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

falcone pushed a commit to branch 3.2-trunk
in repository rtir.

commit f1ba660d91e82f378c98f3e21738b36665587f00
Merge: 7934682 b3edae1
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Nov 14 16:59:50 2014 -0500

    Merge branch '3.0-trunk' into 3.2-trunk
    
    Conflicts:
    	t/upgrade/2.6.0-to-2.9.0.t

 docs/UPGRADING-3.0              | 31 +++++++++++++++++++------------
 etc/upgrade/2.9.0/content       | 24 ------------------------
 html/RTIR/Elements/DueIncidents |  7 ++++++-
 html/RTIR/Elements/NewReports   |  7 ++++++-
 t/upgrade/2.6.0-to-2.9.0.t      | 12 +-----------
 5 files changed, 32 insertions(+), 49 deletions(-)


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