Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 31 Jul 2011 02:51:15 +0000 (21:51 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 31 Jul 2011 02:51:15 +0000 (21:51 -0500)
commit90870c07d409b1d6a4c3d16cc17df33b694e2f43
tree18e4cf1e232a4341602ded00b44b460620595f80
parent34e4be6fb1c047ece5d3fc311e758468f2a72795
parentd4535719370ca3be4790070e4bbe572671ba6045
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin