Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Tue, 27 Nov 2012 22:28:08 +0000 (14:28 -0800)
committerDiane Trout <diane@caltech.edu>
Tue, 27 Nov 2012 22:28:08 +0000 (14:28 -0800)

Trivial merge