Merge remote branch 'remotes/elrond/dev/workbench_class'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 14 Jun 2011 22:17:03 +0000 (17:17 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 14 Jun 2011 22:17:03 +0000 (17:17 -0500)
commit0e9dd2a28669a4d42c4a3828dbd047937acd776c
tree0d33358886420037990f987c5c57de7d006f3c81
parent3fd659e0eb89f56b696d96b4b7aed89aacdfba4c
parentb67a983a02363bd17a4e6a96e650e65aa2d4eb7a
Merge remote branch 'remotes/elrond/dev/workbench_class'
mediagoblin/process_media/__init__.py