Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 19 Aug 2011 17:31:31 +0000 (12:31 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 19 Aug 2011 17:31:31 +0000 (12:31 -0500)
commit0cbab848b9d0540085e61f6db472982c1c2bc102
tree994478dafd2688e6d9da3fb9a5a84acc79559ba3
parent58d717064455c5e0de61f2b09519568bc4a3594a
parentb5017dbac8ad9e8afd70d2d2281571e0155c3739
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin