Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Mon, 6 Aug 2012 21:17:01 +0000 (14:17 -0700)
committerDiane Trout <diane@caltech.edu>
Mon, 6 Aug 2012 21:17:01 +0000 (14:17 -0700)

Trivial merge