[asterisk-commits] qwell: branch group/astridevcon2007 r65954 - /team/group/astridevcon2007/

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Thu May 24 12:27:45 2007
New Revision: 65954

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65954
Log:
Add Tim Ringenbach, fix formatting

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=65954&r1=65953&r2=65954
==============================================================================
--- team/group/astridevcon2007/gpg-keylist.txt (original)
+++ team/group/astridevcon2007/gpg-keylist.txt Thu May 24 12:27:45 2007
@@ -43,15 +43,14 @@
 4E486429  Steve Murphy (aka murf)               3BB4 C179 2A1B 5BB0 9721
           <murf at digium.com>                     6C42 DFF8 C537 4E48 6429
 
-2A15B86B  Stephen Uhler (Asterisk)             2C08 00F0 0B66 BAC9 7A9B
-          <stephen.uhler at sun.com>              D86C 5AF9 576B 2A15 B86B
+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
+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
-<<<<<<< .mine
 
 DEEA6BB3 Mark Michelson <mmichelson at digium.com> F383 9644 9069 1AE1 C817
 						F0DA E0F8 DABE DEEA 6BB3
@@ -61,3 +60,7 @@
 
 64FAEBC5  Tilghman Lesher                       725C 873B 46EB CB7F 0E65
           <tilghman at mail.jeffandtilghman.com>   A95D FE0F 725F 64FA EBC5
+
+3FB1D53B  Tim Ringenbach (Tim Ringenbach at     78D3 29FC D868 C383 E386
+          Asteria Solutions Group, Inc.)        8BCB A2FE 65FF 3FB1 D53B
+          <timr at asteriasgi.com>