[sr-dev] problem with tracking master

[Juha Heinanen]

is this conflict due to some git push done to master recently:

$ eg pull --branch master
jh at git.sip-router.org's password: