Merge remote-tracking branch 'origin/master' into is315
[mediagoblin.git] / CC0_1.0.txt
2011-04-22 Will Kahn-GreeneLicense/copyright changes