Merged revisions 331097 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Mon, 8 Aug 2011 22:59:45 +0000 (22:59 +0000)
committerTerry Wilson <twilson@digium.com>
Mon, 8 Aug 2011 22:59:45 +0000 (22:59 +0000)
commit16acfefa74f3f2d2ec5cfc33b9b21b5d5648ba3f
treeb4e6baaadf93ecab3995851b00805fa338b12938
parent5901f2d0b19e691cf34b9709141445e6a813d159
Merged revisions 331097 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r331097 | twilson | 2011-08-08 17:59:01 -0500 (Mon, 08 Aug 2011) | 5 lines

  Bump the AMI protocol version to 1.2

  As a result of converting Unlink events that were missed in the AMI
  1.1 update to Bridge events, the AMI protocol version is being incremented.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@331098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
CHANGES
UPGRADE.txt
include/asterisk/manager.h