Merged revisions 51931 via svnmerge from
authorOlle Johansson <oej@edvina.net>
Wed, 24 Jan 2007 09:42:31 +0000 (09:42 +0000)
committerOlle Johansson <oej@edvina.net>
Wed, 24 Jan 2007 09:42:31 +0000 (09:42 +0000)
commit273f1d78c7dce90f3c2551fe0421e878a66681eb
tree4d5b079bda0ec89184b06d206b3396dd90730082
parenta9849288deac61451559e3f61d9e9a8ac3eef64a
Merged revisions 51931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51931 | oej | 2007-01-24 10:30:21 +0100 (Wed, 24 Jan 2007) | 3 lines

Show capabilities *and* preference in general settings in "sip show settings"
(reported by Clona/Telio - Thanks!)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c