Merged revisions 328771 via svnmerge from

Merged revisions 328771 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328771 | kmoore | 2011-07-19 10:46:54 -0500 (Tue, 19 Jul 2011) | 18 lines

  Merged revisions 328770 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r328770 | kmoore | 2011-07-19 10:43:32 -0500 (Tue, 19 Jul 2011) | 11 lines

    MeetMe requests a PIN twice in some circumstances

    If a call to MeetMe includes both the dynamic(D) and always request PIN(P)
    options, MeetMe will ask for the PIN two times: once for creating the
    conference and once for entering the conference.  This behavior was introduced
    in rev 311616 when adding the CONFFLAG_ALWAYSPROMPT option to the logic branch
    controlling PIN entry for joining a conference.

    (closes AST-601)
    Review: https://reviewboard.asterisk.org/r/1305/
  ........
................

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