Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@caltech.edu>
Mon, 1 Jul 2013 23:02:46 +0000 (16:02 -0700)
committerDiane Trout <diane@caltech.edu>
Mon, 1 Jul 2013 23:02:46 +0000 (16:02 -0700)
commit6f05ae54b482745afbacc8da7d9cc31f9b067d23
tree0d9788e2b112fced23a1747cb993707c413874ba
parent51e86a29e203304a36f0aca00ab535c93800cbaa
parentd9697c7e4a93736e5bb17bcc771c86ce377713c1
Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
encode_submission/trackhub.py