Merge remote-tracking branch 'brett/bug264-delete-comments-with-media'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 17 Mar 2012 22:18:15 +0000 (17:18 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 17 Mar 2012 22:18:15 +0000 (17:18 -0500)

Trivial merge