Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 14 Mar 2012 21:00:53 +0000 (16:00 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 14 Mar 2012 21:00:53 +0000 (16:00 -0500)
commitd87ed21ac4304bb2bf2dc5d70c3fca99aeb1e089
treeec0fec41d56b87eb75e914a3dede2bce68cb2ad1
parent0e93443f59f61522daeecc5b4f32b2fffc7cd474
parent36ccc57bea30d1a437e673a01e8032a667040962
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin