oscam.conf: change the option 'request_mode'
merge - timer recording can be canceled from instant recording menu
merge - InfoBarGenerics: simplify a bit of code
merge - Both bouquet buttons toggle between playlist and filelist
merge - flag was_timerwakeup
merge - fix compiler warning
merge - filepush: Stop sending data to mux after thread termination (19-10-2012)