[asterisk-commits] mmichelson: branch mmichelson/caller_id r384968 - /team/mmichelson/caller_id/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Apr  8 11:26:13 2013
New Revision: 384968

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384968
Log:
Resolve property merge from pimp_my_sip branch.


Modified:
    team/mmichelson/caller_id/   (props changed)

Propchange: team/mmichelson/caller_id/
------------------------------------------------------------------------------
--- caller_id-integrated (original)
+++ caller_id-integrated Mon Apr  8 11:26:13 2013
@@ -1,1 +1,1 @@
-/team/group/pimp_my_sip:1-384964
+/team/group/pimp_my_sip:1-384967

Propchange: team/mmichelson/caller_id/
            ('outbound_auth-integrated' removed)