Merged revisions 69071 via svnmerge from

[asterisk/asterisk.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index a516382..500fb7c 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -109,7 +109,9 @@ Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin.
 Simon Lockhart - Porting to Solaris (based on work of Logan ???)       
        simon@slimey.org
 
-Olle E. Johansson - SIP RFC compliance, documentation and testing, testing, testing
+Olle E. Johansson - SIP RFC compliance, documentation and testing, testing, testing,
+       - MiniVM - the small voicemail system, many documentation updates/corrections
+       and many bug fixes.
        oej@edvina.net, http://edvina.net
 
 Steve Kann - new jitter buffer for IAX2
@@ -131,12 +133,13 @@ Slav Klenov & Vanheuverzwijn Joachim - development of the generic jitterbuffer
 Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer development
        roy@karlsbakk.net, Briiz Telecom AS
 
-Voop A/S, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - funding for rewrite of SIP transfers
+Voop AS, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - funding for rewrite of SIP transfers
 
 Philippe Sultan - RADIUS CDR module
        INRIA, http://www.inria.fr/
 
 John Martin, Aupix - Improved video support in the SIP channel
+       T.140 text support in RTP/SIP
 
 Steve Underwood - Provided T.38 pass through support.
 
@@ -152,6 +155,10 @@ James Rothenberger - Support for IMAP storage integration added by OneBizTone LL
 
 Paul Cadach - Bringing chan_h323 up to date, bug fixes, and more!
 
+Voop AS - Financial support for a lot of work with the SIP driver and the IAX trunk MTU patch
+
+Philippe Sultan, INRIA - many fixes to res_jabber and gtalk/jingle channel drivers
+
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt
 Michael Jerris - bug marshaling