Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Tue, 28 Aug 2012 22:57:14 +0000 (15:57 -0700)
committerDiane Trout <diane@caltech.edu>
Tue, 28 Aug 2012 22:57:14 +0000 (15:57 -0700)

Trivial merge