Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Wed, 14 Nov 2012 00:38:20 +0000 (16:38 -0800)
committerDiane Trout <diane@caltech.edu>
Wed, 14 Nov 2012 00:38:20 +0000 (16:38 -0800)

Trivial merge