Merged revisions 373665,373675 via svnmerge from

Merged revisions 373665,373675 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r373665 | twilson | 2012-09-25 12:35:30 -0500 (Tue, 25 Sep 2012) | 21 lines

  Properly handle UAC/UAS roles for SIP session timers

  The SIP session timer mechanism contains a mandatory 'refresher' parameter
  (included in the Session-Expires header) which is used in the session timer
  offer/answer signaling within a SIP Invite dialog. It looks like asterisk is
  interpreting the uac resp. uas role only as the initial role of client and
  server (caller is uac, callee is uas). The standard rfc 4028 however assigns
  the client role to the ((RE)-Invite) requester, the server role to the
  ((RE)-Invite) responder.

  This patch has Asterisk track the actual refresher as "us" or "them" as opposed
  to relying on just the configured "uas" or "uac" properties.

  (closes issue AST-922)
  Reported by: Thomas Airmont

  Review: https://reviewboard.asterisk.org/r/2118/
  ........

  Merged revisions 373652 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r373675 | kmoore | 2012-09-25 13:20:04 -0500 (Tue, 25 Sep 2012) | 13 lines

  "show" completion option for "queue" shouldn't appear twice

  When tab-completing CLI commands starting with "queue", "show" appeared
  twice in the list due to the way that Asterisk's tab completion
  functions and the order in which the commands were registered. The
  registration order has been altered to resolve this issue.

  (closes issue AST-940)
  Reported-by: Steve Pitts
  ........

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

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