projects / working / SIPServer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c31f31 83f4913)
Merge remote branch 'working/collab/berick/sip2-support-multiplex-personality-squash1...
authorBill Erickson <berick@esilibrary.com>
Wed, 13 Aug 2014 14:36:11 +0000 (10:36 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 13 Aug 2014 14:36:11 +0000 (10:36 -0400)
commit2a032af6a249f36bbf9e11e5f361e9338ea58ec0
tree7716dc8188665a154b9b6319f769ecabce7407cdtree
parent8c31f313314435735e96670fde1244ce11d1fa3ccommit | diff
parent83f49138768821ce1ac894accd08d898a3c1abf9commit | diff
Merge remote branch 'working/collab/berick/sip2-support-multiplex-personality-squash1' into multiplex-plus-relais-plus-timeout

Conflicts:
SIPServer.pm

Signed-off-by: Bill Erickson <berick@esilibrary.com>
SIPServer.pm diff1 | diff2 | blob | history
SIP Server