Merge branch 'master' of ssh://git.sip-router.org/sip-router
authorAnca Vamanu <anca.vamanu@1and1.ro>
Thu, 8 Mar 2012 15:47:23 +0000 (17:47 +0200)
committerAnca Vamanu <anca.vamanu@1and1.ro>
Thu, 8 Mar 2012 15:47:23 +0000 (17:47 +0200)

Trivial merge