Merge remote-tracking branch 'origin/master' into is315
[mediagoblin.git] / paste.ini
2011-06-20 cfdvMerge remote-tracking branch 'origin/master' into is315
2011-06-20 Christopher Allan... Moving server.ini->paste.ini because willkg points...