[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.1-153-g862f49c

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  862f49c92e64c0bc9b57adfe4b664294cddc21f2 (commit)
       via  90ba56675bc5f288d4483f079f89a3b4c0d4cdc7 (commit)
      from  cf63708a30d759e8d2b045a8053a5c542aaa49ac (commit)

Summary of changes:
 etc/upgrade/4.1.5/content |  1 +
 etc/upgrade/4.2.2/content | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

- Log -----------------------------------------------------------------
commit 862f49c92e64c0bc9b57adfe4b664294cddc21f2
Merge: cf63708 90ba566
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Dec 31 17:18:38 2013 -0500

    Merge branch '4.2/template-column-update-for-disabled-scrips' into 4.2-trunk


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