Merge remote-tracking branch 'brisby/django1.4' into django1.4
[htsworkflow.git] / encode_submission / __init__.py