Last merge should not have brought in the 1.2 props
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 21 Sep 2006 16:43:27 +0000 (16:43 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 21 Sep 2006 16:43:27 +0000 (16:43 +0000)
commit5a5cc53a6a5dcee45b0d2e983d34f23af0a63f3e
treee536da632f2bead10582ce72ec38905605a15194
parent993adde868aa475ae5190b1591efeb556884e165
Last merge should not have brought in the 1.2 props

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