Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Mon, 23 Dec 2013 22:30:36 +0000 (14:30 -0800)
committerDiane Trout <diane@caltech.edu>
Mon, 23 Dec 2013 22:30:36 +0000 (14:30 -0800)

Trivial merge