Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Sat, 5 Nov 2011 00:01:41 +0000 (17:01 -0700)
committerDiane Trout <diane@caltech.edu>
Sat, 5 Nov 2011 00:01:41 +0000 (17:01 -0700)
commit2ad045b9026e0cb9e7d3d325c26f900bf1cbe334
treebab104a46a0db7bb1f512751842a92ec7d3f2913
parent61ce2870651f2f3d7d63d3f7efce2d4bd84cc92f
parent764cd85cb41444c196bcf01c8a58d74631a476a1
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

Conflicts:
htsworkflow/pipelines/eland.py
htsworkflow/pipelines/retrieve_config.py
htsworkflow/pipelines/runfolder.py
scripts/htsw-runfolder
extra/ucsc_encode_submission/encode_find.py
htsworkflow/frontend/samples/views.py
htsworkflow/pipelines/retrieve_config.py
htsworkflow/pipelines/runfolder.py
htsworkflow/pipelines/srf.py
scripts/htsw-runfolder