Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Sat, 30 Jun 2012 03:13:57 +0000 (20:13 -0700)
committerDiane Trout <diane@caltech.edu>
Sat, 30 Jun 2012 03:13:57 +0000 (20:13 -0700)

Trivial merge