Merge remote branch 'qatar/master'
[ffmpeg.git] / tests / ffserver.conf
2009-03-29 Diego BiurrunRename test.conf --> ffserver.conf, the new name is...