Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4
[htsworkflow.git] / htsworkflow / frontend / fixtures /
drwxr-xr-x   ..
-rw-r--r-- 2065 bcmagic.xml
-rw-r--r-- 1527 initial_data.xml