Merge branch 'master' of https://github.com/kamailio/kamailio
authorJuha Heinanen <jh@tutpro.com>
Fri, 4 Dec 2015 22:23:42 +0000 (00:23 +0200)
committerJuha Heinanen <jh@tutpro.com>
Fri, 4 Dec 2015 22:23:42 +0000 (00:23 +0200)
commitb56fae6d00f92628055301c4ac50a2929b49d3b4
tree4de797ca1db628bac7c97268f70d4493f956f260
parenta67bb24f24960e726523810da197cc7c816864f5
parentf9d16e38dbf6b263fc29dceca66007357a9e6f37
Merge branch 'master' of https://github.com/kamailio/kamailio