Merge branch 'dev' into crem
Merge branch 'crem2' into diadems
Merge branch 'crem2' into diadems
add collection zip package button and view
fix no file
locale
zip collection package in settings.FILE_UPLOAD_TEMP_DIR
add allowZip64=True to collection zip package
add fading kdenlive rendering batch
fix fading in kdenlive rendering
fix kdenlive rendering
add time to transcoder logger
add thumbs and dry-run to transcode
fix transcode script
add thread parameter to transcode
fix django==1.4.5, cleanup deps
Merge branch 'dev' into crem2
Merge branch 'diadems' into crem2