[Rt-commit] rt branch, master, updated. rt-4.1.7-14-g0a6acd7

[Alex Vandiver]

The branch, master has been updated
       via  0a6acd71b3f16c5ce17385d8054d3842238fe850 (commit)
       via  f25a7af0001060397bf28113f8a2e04afb5af782 (commit)
       via  5b39b3c10ac8bea92260548add7de42b33bb1084 (commit)
       via  e9a2f200d8ceb4c021bacf027dc26c79a84bb291 (commit)
      from  17aae96ce7f27cf84751b87356933850d6dc7c30 (commit)

Summary of changes:
 docs/UPGRADING-4.2                 | 12 ++++++++
 etc/upgrade/time-worked-history.pl | 63 ++++++++++++++++++++++++++++++++++++++
 lib/RT/Ticket.pm                   | 11 ++++---
 t/ticket/merge.t                   | 45 ++++++++++++++++++++++++++-
 4 files changed, 125 insertions(+), 6 deletions(-)
 create mode 100644 etc/upgrade/time-worked-history.pl

- Log -----------------------------------------------------------------
commit 0a6acd71b3f16c5ce17385d8054d3842238fe850
Merge: 17aae96 f25a7af
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Apr 9 11:48:06 2013 -0400

    Merge branch '4.2/time-fields-on-merge'


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