[svn-commits] branch oej/res_config_ldap r31638 - in /team/oej/res_config_ldap: ./ CREDITS

[svn-commits at lists.digium.com]

Author: oej
Date: Fri Jun  2 01:28:14 2006
New Revision: 31638

URL: http://svn.digium.com/view/asterisk?rev=31638&view=rev
Log:
Reset automerge

Modified:
    team/oej/res_config_ldap/   (props changed)
    team/oej/res_config_ldap/CREDITS

Propchange: team/oej/res_config_ldap/
------------------------------------------------------------------------------
--- automerge (original)
+++ automerge Fri Jun  2 01:28:14 2006
@@ -1,1 +1,1 @@
-*
+http://edvina.net/training/

Propchange: team/oej/res_config_ldap/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun  2 01:28:14 2006
@@ -1,1 +1,1 @@
-/trunk:1-31626
+/trunk:1-31637

Modified: team/oej/res_config_ldap/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/res_config_ldap/CREDITS?rev=31638&r1=31637&r2=31638&view=diff
==============================================================================
--- team/oej/res_config_ldap/CREDITS (original)
+++ team/oej/res_config_ldap/CREDITS Fri Jun  2 01:28:14 2006
@@ -117,6 +117,7 @@
 Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer development
 	roy at karlsbakk.net, Briiz Telecom AS
 
+Voop A/S, Nuvio Inc and Foniris Telecom A/S - funding for rewrite of SIP transfers
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt