[Rt-commit] [rtir] 02/02: Merge branch '3.0.1-releng' into 3.0-trunk

[Kevin Falcone]

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

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

commit 4e7da66f41fb2b97ad39193c873e2c7747b52152
Merge: 97a2444 ff42093
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Mon Mar 31 16:18:48 2014 -0400

    Merge branch '3.0.1-releng' into 3.0-trunk

 META.yml                            |  2 +-
 docs/UPGRADING-3.0                  |  4 ++--
 html/RTIR/Tools/ScriptedAction.html | 14 ++++----------
 inc/Module/Install/RTx.pm           | 10 ++++++----
 lib/RT/IR.pm                        |  2 +-
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --cc META.yml
index 0d1330b,c65386c..8a08675
--- a/META.yml
+++ b/META.yml
@@@ -32,4 -32,4 +32,4 @@@ requires
    perl: 5.8.3
  resources:
    license: http://opensource.org/licenses/gpl-license.php
- version: 3.0.1rc1
 -version: 3.0.1
++version: 3.0.HEAD
diff --cc lib/RT/IR.pm
index dad138e,1ce2a0c..afdd5cd
--- a/lib/RT/IR.pm
+++ b/lib/RT/IR.pm
@@@ -52,7 -52,7 +52,7 @@@ use warnings
  
  package RT::IR;
  
- our $VERSION = '3.0.1rc1';
 -our $VERSION = '3.0.1';
++our $VERSION = '3.0.HEAD';
  
  
  use Scalar::Util qw(blessed);

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