Merge branch 'master' of https://github.com/smititelu/kamailio
authorRichard Fuchs <rfuchs@sipwise.com>
Thu, 10 Dec 2015 11:54:47 +0000 (06:54 -0500)
committerRichard Fuchs <rfuchs@sipwise.com>
Thu, 10 Dec 2015 11:54:47 +0000 (06:54 -0500)

Trivial merge