Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 22 Apr 2012 15:06:52 +0000 (10:06 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 22 Apr 2012 15:06:52 +0000 (10:06 -0500)
commitfe449159223cef27bba2ad47726ffee67e9a29cc
tree6694e48cafd6512d564014e6aed155d2fe5b9fd7
parent5d88f39875dfc943b4e11974b3f79f93b05800d3
parente2afad955f2a0822fb87ee51ad2966a0b2ccf808
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin