........

Merged revisions 369024 from http://svn.asterisk.org/svn/asterisk/certified/branches/1.8.11
........

Merged revisions 369026 from http://svn.asterisk.org/svn/asterisk/branches/10-digiumphones


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