Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 14 Mar 2012 21:00:53 +0000 (16:00 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 14 Mar 2012 21:00:53 +0000 (16:00 -0500)

Trivial merge