Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@ghic.org>
Tue, 10 Dec 2013 00:30:05 +0000 (16:30 -0800)
committerDiane Trout <diane@ghic.org>
Tue, 10 Dec 2013 00:30:05 +0000 (16:30 -0800)

Trivial merge