From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 17 Mar 2012 22:18:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'brett/bug264-delete-comments-with-media'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=16fca040d5d27879f244ded2b7455acfb7b6405f;p=mediagoblin.git

Merge remote-tracking branch 'brett/bug264-delete-comments-with-media'
---

16fca040d5d27879f244ded2b7455acfb7b6405f