[sr-dev] merging back to master branch

Hello, what is the recommended way to merge back into master branch the fixes done in 3.0 releases? The master is now behind of sr_3.0 and kamailio_3.0 with many fixes. kamailio_3.0 should be pretty much sync'ed with sr_3.0, but has some kamailio specific updates that need to be discussed before pushing to master. I think fixes in modules_k can get bulk in master, for the rest I will try to compile a summary. Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/