Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@ghic.org>
Mon, 21 Oct 2013 20:59:29 +0000 (13:59 -0700)
committerDiane Trout <diane@ghic.org>
Mon, 21 Oct 2013 20:59:29 +0000 (13:59 -0700)

Trivial merge