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)
commita130abd37e306fea5208c1172ebfd3e69acb2b7b
tree62fc5350f82636804553e9358710629e39816fb3
parentce8f7bfa18d9d20960b229b55fbb58a1994d3397
parent0d4b90ea9752e9871bffc542c834b91f043c3ea7
Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4