From: Aaron Williamson Date: Thu, 19 Jan 2012 01:40:18 +0000 (-0500) Subject: Merge branch 'mediagoblin-upstream' into feature544_basic_license_data X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=291e24f3977308514f0227a2402ecd52a80567d5;p=mediagoblin.git Merge branch 'mediagoblin-upstream' into feature544_basic_license_data --- 291e24f3977308514f0227a2402ecd52a80567d5