Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Sat, 12 May 2012 00:49:59 +0000 (17:49 -0700)
committerDiane Trout <diane@caltech.edu>
Sat, 12 May 2012 00:49:59 +0000 (17:49 -0700)

Trivial merge