Merge commit '685e6f2e3939f124b41c7801cc541dad8252af3d'
[ffmpeg.git] / tests / ffserver.conf
2009-03-29 Diego BiurrunRename test.conf --> ffserver.conf, the new name is...