Merged revisions 337263 via svnmerge from
authorGregory Nietsky <gregory@distrotech.co.za>
Wed, 21 Sep 2011 11:21:49 +0000 (11:21 +0000)
committerGregory Nietsky <gregory@distrotech.co.za>
Wed, 21 Sep 2011 11:21:49 +0000 (11:21 +0000)
commit2bb0d456eb60b3c2caa89945417694e04ff29561
tree268be579b5fe0d1ca8e296190d186465fa890eb8
parent8f10934c185d376fbc90e49cece4c92383f78eb5
Merged revisions 337263 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r337263 | irroot | 2011-09-21 13:15:48 +0200 (Wed, 21 Sep 2011) | 1 line

  Whitespace fixup from SRTP patch
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/sip.conf.sample