Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@caltech.edu>
Thu, 13 Dec 2012 18:21:36 +0000 (10:21 -0800)
committerDiane Trout <diane@caltech.edu>
Thu, 13 Dec 2012 18:21:36 +0000 (10:21 -0800)

Trivial merge