Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
authorDiane Trout <diane@caltech.edu>
Thu, 5 Dec 2013 23:06:14 +0000 (15:06 -0800)
committerDiane Trout <diane@caltech.edu>
Thu, 5 Dec 2013 23:06:14 +0000 (15:06 -0800)
1  2 
htsworkflow/pipelines/runfolder.py

Simple merge