[asterisk-commits] oej: branch group/astridevcon2007 r65950 - /team/group/astridevcon2007/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu May 24 12:18:39 2007
New Revision: 65950

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65950
Log:
Resolving conflict. Where's automerge?

Modified:
    team/group/astridevcon2007/gpg-keylist.txt

Modified: team/group/astridevcon2007/gpg-keylist.txt
URL: http://svn.digium.com/view/asterisk/team/group/astridevcon2007/gpg-keylist.txt?view=diff&rev=65950&r1=65949&r2=65950
==============================================================================
--- team/group/astridevcon2007/gpg-keylist.txt (original)
+++ team/group/astridevcon2007/gpg-keylist.txt Thu May 24 12:18:39 2007
@@ -40,5 +40,11 @@
 336EFD9A  Matthew A. Nicholson                  226B 9B3C A8FE 6801 79C8
           <mnicholson at digium.com>               73A8 BEE1 9A76 336E FD9A
 
+2A15B86B  Stephen Uhler (Asterisk)             2C08 00F0 0B66 BAC9 7A9B
+          <stephen.uhler at sun.com>              D86C 5AF9 576B 2A15 B86B
+
+EBAAE15F  Marc Blanchet                        EC0D 0E23 450C E00D 6CCC
+          marc.blanchet at viagenie.ca            AF64 D131 764A EBAA E15F
+
 FCAEF754  BJ Weschke                            1B62 F1FA A1E7 D58D F8F6
           <bweschke at btwtech.com>                33AB 6041 7FA8 FCAE F754