Blocked revisions 415838
authorJonathan Rose <jrose@digium.com>
Thu, 12 Jun 2014 15:52:20 +0000 (15:52 +0000)
committerJonathan Rose <jrose@digium.com>
Thu, 12 Jun 2014 15:52:20 +0000 (15:52 +0000)
commit435343cfea85d54b59a271685530e09c3844ec7b
tree0f1589271d7f6918b808f8ab68c82cc3eee15b89
parentfa8c58fefb38424216c4d4ae66f31084bce4e16f
Blocked revisions 415838

........
Correct UPGRADE.txt notes in r415825

The change was marked against the wrong version of Asterisk. My apologies.
........

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

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