Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 12 Jun 2011 22:42:26 +0000 (17:42 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 12 Jun 2011 22:42:26 +0000 (17:42 -0500)
commit48a7ba1e1cfd56f2485345bd37bd2450fe923419
tree7ce926bb160f4d01337b0c5cc897880cbaee2ade
parent34d35a23930815438a4e1d8b28ec17016fb938c0
parent180bdbde93ad4b62395c78e99e97587b44ad31c7
Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean'

Conflicts:
mediagoblin/process_media/__init__.py
mediagoblin/process_media/__init__.py