Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@ghic.org>
Tue, 10 Jun 2014 22:48:46 +0000 (15:48 -0700)
committerDiane Trout <diane@ghic.org>
Tue, 10 Jun 2014 22:48:46 +0000 (15:48 -0700)

Trivial merge