Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Wed, 28 Nov 2012 19:37:34 +0000 (11:37 -0800)
committerDiane Trout <diane@caltech.edu>
Wed, 28 Nov 2012 19:37:34 +0000 (11:37 -0800)

Trivial merge