Merge remote branch 'kc/new/bug_5586' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 23 Jan 2011 18:21:47 +0000 (07:21 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 23 Jan 2011 18:21:47 +0000 (07:21 +1300)
1  2 
C4/SIP/Sip.pm

diff --cc C4/SIP/Sip.pm
Simple merge