[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 94ed39c0130f9d8b7db067abd92c2f0e110c071c
Merge: 6d431d7 212cf64
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Fri Oct 3 18:06:33 2014 -0400

    Merge branch '3.0-trunk' into 3.2-trunk
    
    Conflicts:
    	META.yml

 MANIFEST                  |  1 +
 META.yml                  |  2 +-
 docs/UPGRADING-3.0        | 24 +++++++++++++++++++-----
 inc/Module/Install/RTx.pm |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --cc META.yml
index b290045,5ac9b98..2703bd0
--- a/META.yml
+++ b/META.yml
@@@ -27,12 -26,13 +27,12 @@@ no_index
      - t
  requires:
    DBIx::SearchBuilder: 1.61
 -  Hook::LexWrap: 0
    Parse::BooleanLogic: 0
    Regexp::Common: 0
 -  perl: 5.8.3
 +  perl: 5.10.1
  resources:
    license: http://opensource.org/licenses/gpl-license.php
 -version: 3.0.HEAD
 +version: 3.2.HEAD
- x_module_install_rtx_version: 0.35_01
+ x_module_install_rtx_version: '0.36'
 -x_requires_rt: 4.0.14
 -x_rt_too_new: 4.2.0
 +x_requires_rt: 4.2.7
 +x_rt_too_new: 4.4.0

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