Blocked revisions 172639 via svnmerge
authorTerry Wilson <twilson@digium.com>
Sat, 31 Jan 2009 00:16:46 +0000 (00:16 +0000)
committerTerry Wilson <twilson@digium.com>
Sat, 31 Jan 2009 00:16:46 +0000 (00:16 +0000)
commit27862b0dceacada23ee01c11fd2649f3108a5101
treedf3a2301db9a4a050247efa146d43b28b6eda68c
parent458dfe474878c640ca6453ef7ea5871409c5e19d
Blocked revisions 172639 via svnmerge

........
  r172639 | twilson | 2009-01-30 18:15:09 -0600 (Fri, 30 Jan 2009) | 5 lines

  Rename new parkedcallparking option to parkedcallreparking

  Since this option actually already existed in 1.6.0+, use the same name so as
  not to confuse people when they upgrade
........

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