Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@ghic.org>
Thu, 5 Dec 2013 23:28:36 +0000 (15:28 -0800)
committerDiane Trout <diane@ghic.org>
Thu, 5 Dec 2013 23:28:36 +0000 (15:28 -0800)

Trivial merge