Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Wed, 22 Jan 2014 22:14:26 +0000 (14:14 -0800)
committerDiane Trout <diane@caltech.edu>
Wed, 22 Jan 2014 22:14:26 +0000 (14:14 -0800)

Trivial merge