[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.17-87-ga87a48a

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  a87a48ac1a24b71b9b87041dc7aebc755ce7cd44 (commit)
       via  949af6145b51a4d58e407eb18f7122898e59846d (commit)
      from  b690c840eccdbfd9213af31c3374393c4a41281c (commit)

Summary of changes:
 etc/upgrade/{4.0.12 => 4.0.18}/content | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename etc/upgrade/{4.0.12 => 4.0.18}/content (100%)

- Log -----------------------------------------------------------------
commit 949af6145b51a4d58e407eb18f7122898e59846d
Author: Christian Loos <cloos at netcologne.de>
Date:   Wed Sep 18 11:06:42 2013 +0200

    move upgrade script to the next free slot
    
    The merge was after the 4.0.17 release.
    This should have been part of 3a1c534.

diff --git a/etc/upgrade/4.0.12/content b/etc/upgrade/4.0.18/content
similarity index 100%
rename from etc/upgrade/4.0.12/content
rename to etc/upgrade/4.0.18/content

commit a87a48ac1a24b71b9b87041dc7aebc755ce7cd44
Merge: b690c84 949af61
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Sep 26 14:27:57 2013 -0400

    Merge branch '4.0/move-misversioned-upgrade' into 4.0-trunk


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