[Rt-commit] rt branch, master, updated. rt-4.1.5-177-g2e0ac80

[Alex Vandiver]

The branch, master has been updated
       via  2e0ac8053cb09d0af7ea93e5af60bf87930340e9 (commit)
       via  e171d62f8f4ec56121d66c9ed6ed0617ed118553 (commit)
       via  f244493bb1eb47c94a43004f9ae33d1e1f392d32 (commit)
      from  1c53cbd628ea46945ab66c8cb4483f0683b35432 (commit)

Summary of changes:
 t/api/date.t | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 2e0ac8053cb09d0af7ea93e5af60bf87930340e9
Merge: 1c53cbd e171d62
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Dec 28 19:34:53 2012 -0500

    Merge branch '4.2/relative-time-parsing-tests'
    
    Conflicts:
    	t/api/date.t

diff --cc t/api/date.t
index 728a4a2,bbba290..54ff5eb
--- a/t/api/date.t
+++ b/t/api/date.t
@@@ -2,9 -2,8 +2,9 @@@
  use Test::MockTime qw(set_fixed_time restore_time);
  use DateTime;
  
 -use warnings; use strict;
 -use RT::Test tests => 177;
 +use warnings;
 +use strict;
- use RT::Test tests => 173;
++use RT::Test tests => undef;
  use RT::User;
  use Test::Warn;
  
@@@ -554,3 -581,3 +582,4 @@@ my $year = (localtime(time))[5] + 1900
  #TODO: AsString
  #TODO: RFC2822, W3CDTF with Timezones
  
++done_testing;

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