Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Wed, 16 May 2012 16:49:53 +0000 (09:49 -0700)
committerDiane Trout <diane@caltech.edu>
Wed, 16 May 2012 16:49:53 +0000 (09:49 -0700)

Trivial merge