Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 14 Apr 2013 01:21:14 +0000 (20:21 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 14 Apr 2013 01:21:14 +0000 (20:21 -0500)

Trivial merge