Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 20 May 2012 20:24:02 +0000 (15:24 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 20 May 2012 20:24:37 +0000 (15:24 -0500)
commit758def22b82f32d5c399148bdc2b4a81b8e3c700
tree72c242429f1126c1147e21ef503a00bb046b8a2e
parenta8acb5a387fd8b7365e6762d1f0573262ad5f596
parentb781c3c9281b0356a8b7cc18065610dfccad7fcf
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin