Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
authorDiane Trout <diane@caltech.edu>
Mon, 9 May 2011 22:05:49 +0000 (15:05 -0700)
committerDiane Trout <diane@caltech.edu>
Mon, 9 May 2011 22:05:49 +0000 (15:05 -0700)
commitbc07c72145f4b796d5647d8d1c556f9f627cfdb3
treeefafd2c79a1b8ca83e64e212a9e946660376a654
parentd8f805b1f13195d66741a01822b6cde2fc3ce320
parent4973ba49f29b2b807395322295757f09cf94aebd
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
htsworkflow/settings.py