Merge remote-tracking branch 'refs/remotes/merge-requests/40'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 19 Aug 2012 17:14:39 +0000 (12:14 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 19 Aug 2012 17:14:39 +0000 (12:14 -0500)
commit944b92dc2fef2932136020709d2037548a29e7e0
tree7cbd9e44a807896a22784ecaa6b9dcdc86c78a55
parent2a9f519b29d73a8db1012891d77b256c321b62a1
parentb3b42bbe7b46f2ff0560d60acef749489dc51837
Merge remote-tracking branch 'refs/remotes/merge-requests/40'
mediagoblin/templates/mediagoblin/admin/panel.html
mediagoblin/templates/mediagoblin/user_pages/processing_panel.html