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

Trivial merge