From: Christopher Allan Webber Date: Tue, 22 Jan 2013 19:43:02 +0000 (-0600) Subject: Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' into mergetest X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f;p=mediagoblin.git Merge remote-tracking branch 'refs/remotes/spaetz/521_license_preference' into mergetest --- 79f7cfd900c115fd4c1e4fe8e50f6aad6a56160f