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)
1  2 
encode_submission/trackhub.py

Simple merge