From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Mon, 8 Apr 2013 13:57:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'cwebber/254_delete_queue_directories'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2dd0af36359a50efbef7dfefaea1f05ae633325c;p=mediagoblin.git

Merge remote-tracking branch 'cwebber/254_delete_queue_directories'

* cwebber/254_delete_queue_directories:
  Removing docstring bit about delete_file possibly deleting directories in the future
  Convert media processing backends to delete the queue directory (#254)
  Implement delete_dir in the FileStorage

Conflicts:
	mediagoblin/media_types/image/processing.py
	mediagoblin/media_types/video/processing.py

Conflicts, because those media_types already use the newer
proc_state.delete_queue_file() method (which needs
updating.
---

2dd0af36359a50efbef7dfefaea1f05ae633325c