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

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu May 24 12:25:37 2007
New Revision: 65953

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65953
Log:
Update...

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=65953&r1=65952&r2=65953
==============================================================================
--- team/group/astridevcon2007/gpg-keylist.txt (original)
+++ team/group/astridevcon2007/gpg-keylist.txt Thu May 24 12:25:37 2007
@@ -51,7 +51,13 @@
 
 FCAEF754  BJ Weschke                            1B62 F1FA A1E7 D58D F8F6
           <bweschke at btwtech.com>                33AB 6041 7FA8 FCAE F754
+<<<<<<< .mine
+
+DEEA6BB3 Mark Michelson <mmichelson at digium.com> F383 9644 9069 1AE1 C817
+						F0DA E0F8 DABE DEEA 6BB3
+
+D430C043 Steven Sokol                           8AB 005A 1FAE 0CC5 BEE2
+         <ssokol at sokol-associates.com>          568A 4AB9 894D D430 C043
 
 64FAEBC5  Tilghman Lesher                       725C 873B 46EB CB7F 0E65
           <tilghman at mail.jeffandtilghman.com>   A95D FE0F 725F 64FA EBC5
-