Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 26 Jun 2011 20:22:01 +0000 (15:22 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 26 Jun 2011 20:22:01 +0000 (15:22 -0500)
commitda0683b48c9ed6fc4ada1aff758e493bd2311d48
tree9f8095007274ae233f9936d4bb4e84deaed830c5
parent9ea5c28b7a3bb74cebd923353b9e4c780e658d74
parente1d9e1d139a81d4d7592d349e3594d3a9d21c285
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin