[asterisk-commits] qwell: branch group/pimp_my_sip r386865 - /team/group/pimp_my_sip/

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Apr 29 12:54:19 2013
New Revision: 386865

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=386865
Log:
Recorded merge of revisions 386540-386541 from http://svn.asterisk.org/svn/asterisk/trunk

........
Multiple revisions 386540-386541

........
  r386540 | mmichelson | 2013-04-25 13:25:31 -0500 (Thu, 25 Apr 2013) | 15 lines
  
  Merge the pimp_my_sip branch into trunk.
  
  The pimp_my_sip branch is being merged at this point because
  it offers basic functionality, and from an API standpoint, things
  are complete.
  
  SIP work is *not* feature-complete; however, with the completion
  of the SUBSCRIBE/NOTIFY API, all APIs (except a PUBLISH API) have
  been created, and thus it is possible for developers to attempt
  to create new SIP work.
  
  API documentation can be found in the doxygen in the code, but
  usability documentation is still lacking.
........
  r386541 | mmichelson | 2013-04-25 13:28:37 -0500 (Thu, 25 Apr 2013) | 3 lines
  
  REmove automerge properties.

Modified:
    team/group/pimp_my_sip/   (props changed)

Propchange: team/group/pimp_my_sip/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 29 12:54:19 2013
@@ -1,1 +1,1 @@
-/trunk:1-386489
+/trunk:1-386489,386540-386541