Merge branch 'master' of ssh://git.sip-router.org/sip-router
authorCarsten Bock <carsten@bock.info>
Thu, 17 Mar 2011 09:50:14 +0000 (10:50 +0100)
committerCarsten Bock <carsten@bock.info>
Thu, 17 Mar 2011 09:50:14 +0000 (10:50 +0100)

Trivial merge