Merged revisions 373737 via svnmerge from

Merged revisions 373737 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r373737 | mmichelson | 2012-09-25 16:12:40 -0500 (Tue, 25 Sep 2012) | 11 lines

  Fix error where improper IMAP greetings would be deleted.

  (closes issue ASTERISK-20435)
  Reported by: fhackenberger
  Patches:
  	asterisk-20435-imap-del-greeting.diff uploaded by Michael L. Young (License #5026)
  	(with suggested modification made by me)
  ........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@373765 65c4cc65-6c06-0410-ace0-fbb531ad65f3