fix bad edit after conflict resolution
authorAlec L Davis <sivad.a@paradise.net.nz>
Mon, 10 Jun 2013 08:38:03 +0000 (08:38 +0000)
committerAlec L Davis <sivad.a@paradise.net.nz>
Mon, 10 Jun 2013 08:38:03 +0000 (08:38 +0000)
commita6ab25a004ee04806c92e9ff009b8a57226334fb
tree5d07a7d1f990f1200fd8f19738011d49c5409544
parentd264518524754fccc967d49fba16eeaf54b1af3d
fix bad edit after conflict resolution
........

Merged revisions 391107 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 391111 from http://svn.asterisk.org/svn/asterisk/branches/11

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