Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 29 Mar 2013 13:09:36 +0000 (08:09 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 29 Mar 2013 13:09:36 +0000 (08:09 -0500)

Trivial merge