[sr-dev] git:master:31ab2983: Merge branch 'master' of https://github.com/kamailio/kamailio

Module: kamailio Branch: master Commit: 31ab2983d66bc21843210d29ed3cc1ac0343906c URL: https://github.com/kamailio/kamailio/commit/31ab2983d66bc21843210d29ed3cc1a… Author: The Root <root(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2016-10-17T15:46:07+02:00 Merge branch 'master' of https://github.com/kamailio/kamailio # By Richard Good # Via Richard Good * 'master' of https://github.com/kamailio/kamailio: modules/ims_usrloc_scscf: new parameter max_subscribes --- Modified: modules/ims_usrloc_scscf/subscribe.c Modified: modules/ims_usrloc_scscf/ul_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/31ab2983d66bc21843210d29ed3cc1a… Patch: https://github.com/kamailio/kamailio/commit/31ab2983d66bc21843210d29ed3cc1a…