Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@caltech.edu>
Thu, 17 Oct 2013 21:17:52 +0000 (14:17 -0700)
committerDiane Trout <diane@caltech.edu>
Thu, 17 Oct 2013 21:17:52 +0000 (14:17 -0700)

Trivial merge