2754: Merge branch '2754-pipeline-template-description' refs #2754
authorTom Clegg <tom@curoverse.com>
Wed, 28 May 2014 16:44:04 +0000 (12:44 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 28 May 2014 16:44:04 +0000 (12:44 -0400)

Trivial merge