Merge branch 'master' into django1.4
[htsworkflow.git] / htsworkflow / __init__.py