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)
commit63bdcf938eb8a421d188287cda4109495b90679d
treed89780ce5bc2cf2fc7dd6f3a5513ac0cb3c5b461
parent573fb14500e40a32c03bd3734ada296da769b884
parenta130abd37e306fea5208c1172ebfd3e69acb2b7b
Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4