Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 4 Dec 2011 17:06:08 +0000 (11:06 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 4 Dec 2011 17:06:08 +0000 (11:06 -0600)

Trivial merge