Merge branch 'master' of ssh://git.sip-router.org/sip-router
authorJason Penton <jason.penton@gmail.com>
Mon, 17 Mar 2014 14:11:16 +0000 (16:11 +0200)
committerJason Penton <jason.penton@gmail.com>
Mon, 17 Mar 2014 14:11:16 +0000 (16:11 +0200)

Trivial merge