Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 20 Apr 2011 00:05:58 +0000 (19:05 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 20 Apr 2011 00:05:58 +0000 (19:05 -0500)
commit9ec591086111b77eef0d961b07791a418b667509
treec36dd304548f682d0cac1737d490f0dcf1a3b443
parente323a06851cf2a5c7f26d4a969185323c20c8d9d
parentc66d0f5c669aac298344b26a1fe6ab5f3edc5625
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin