Fix bug in TempFileMgr startup
Merge branch 'master' into resume_fix
Updated ffmpeg subs implementation
Merge remote-tracking branch 'UMS/master'
Return use subs the temp folder back to general
Formatting
Update Mencoder set AR
Merge branch 'resume_fix' of github.com:UniversalMediaServer/UniversalMediaServer into resume_fix
Sync