Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 21:51:30 +0000 (15:51 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 17 Jan 2013 21:51:30 +0000 (15:51 -0600)

Trivial merge