Merge remote-tracking branch 'remotes/slikdigit/bassam'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Mar 2012 20:09:35 +0000 (15:09 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 26 Mar 2012 20:09:35 +0000 (15:09 -0500)
commitc0516158896e2bdf1592f1331b9ecf1979d4c099
tree1e11fbb0666c2048ac3fb90e77e051b95a9d7357
parente3e5980624d70922b84df764d32625d088fb841c
parent0f8221dca40dc8628f8b8146a2ef2043e95781c2
Merge remote-tracking branch 'remotes/slikdigit/bassam'

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