Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
authorDiane Trout <diane@ghic.org>
Wed, 29 Oct 2014 17:34:19 +0000 (10:34 -0700)
committerDiane Trout <diane@ghic.org>
Wed, 29 Oct 2014 17:34:19 +0000 (10:34 -0700)

Trivial merge