Revision 220906 (a merge from 1.4) was not merged correctly, causing a problem...

Revision 220906 (a merge from 1.4) was not merged correctly, causing a problem with non-dynamic peers.


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