Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 1 Aug 2011 01:53:29 +0000 (20:53 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Mon, 1 Aug 2011 01:53:29 +0000 (20:53 -0500)
commitbfb280d3b3cdb801adda381cdf47f96e5b936526
treece3782dd40e5502eeaaf8a2e056cced30cd3e9f2
parent5d9006479088ecadcc4dcef14a9d8ccb0e4227f3
parentfd857e219fbf3cd1671ce4971e67d57207af18bc
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin