Remove weird mergeinfo props that make merges annoying sometimes.

[asterisk/asterisk.git] / CREDITS

diff --git a/CREDITS b/CREDITS
index f035774..b93044d 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -17,6 +17,14 @@ nic.at - ENUM support in Asterisk
 
 Paul Bagyenda, Digital Solutions - for initial Voicetronix driver development
 
+John Todd, TalkPlus, Inc.  and JR Richardson, Ntegrated Solutions. - for funding
+    the development of SIP Session Timers support.
+
+Omnitor AB, Gunnar Hellström, for funding work with videocaps, T.140 RED,
+originate with video/text and many more contributions.
+
+ClearIT AB for work with meetme, res_mutestream, RTCP, manager and tonezones
+
 === WISHLIST CONTRIBUTERS ===
 Jeremy McNamara - SpeeX support
 Nick Seraphin - RDNIS support
@@ -53,7 +61,7 @@ Anthony Minessale II - Countless big and small fixes, and relentless forward
        and sip configs.
        anthmct(AT)yahoo.com              http://www.asterlink.com
 
-James Golovich - Innumerable contributions
+James Golovich - Innumerable contributions, including SIP TCP and TLS support.
        You can find him and asterisk-perl at http://asterisk.gnuinter.net
 
 Andre Bierwirth - Extension hints and status
@@ -106,7 +114,11 @@ Simon Lockhart - Porting to Solaris (based on work of Logan ???)
        simon(AT)slimey.org
 
 Olle E. Johansson - SIP RFC compliance, documentation and testing, testing,
-       testing; MiniVM - the small voicemail system, many documentation
+       SIP outbound proxy support, Manager 1.1 update, SIP transfer support,
+       SIP presence support, SIP call state updates (dialog-info), 
+       QUEUE_EXISTS function, device state provider architecture,
+       multiparking (together with mvanbaak), meetme and parking device states,
+       MiniVM - the small voicemail system, many documentation
        updates/corrections, and many bug fixes.
        oej(AT)edvina.net, http://edvina.net
 
@@ -166,6 +178,53 @@ Voop AS - Financial support for a lot of work with the SIP driver and the IAX
 Cedric Hans - Development of chan_unistim
   cedric.hans(AT)mlkj.net
 
+Takao Takahashi & Mina Naguib - chan_unistim improvements for smaller devices
+
+Sergio Fadda - console_video: video support for chan_oss and chan_alsa
+
+Marta Carbone - console_video and the astobj2 framework
+
+Luigi Rizzo - astobj2, console_video, windows build, chan_oss cleanup,
+       and a bunch of infrastructure work (loader, new_cli, ...)
+
+Brett Bryant - digit option for musiconhold selection, ENUMQUERY and ENUMRESULT functions,
+       feature group configuration for features.conf, per-file CLI debug and verbose settings,
+       TCP and TLS support for SIP, and various bug fixes.
+       brettbryant(AT)gmail.com
+
+Sergey Tamkovich - Realtime support for MusicOnHold, store and destroy realtime methods and
+       implementations for odbc, sqlite, and pgsql realtime drivers, attended transfer updates,
+       multiple speeds for ControlPlayback, and multiple bug fixes
+       - See http://voip-info.org/users/view/sergee
+       serg(AT)voipsolutions.ru
+
+Klaus Darillon - the SIPremoveHeader function in chan_sip
+
+Moises Silva (moy) - for writing LibOpenR2, and providing support for it in chan_dahdi
+     moises.silva(AT)gmail.com
+
+Eliel C. Sardanons - XML documentation implementation, and various other contributions
+     eliels(AT)gmail.com
+
+Sean Bright - Snom call pickup, newt interface for menuselect, cdr_tds rewrite,
+       countless other improvements, fixes, and good ideas.
+       sean(AT)malleable.com
+
+Jan Kaláb - Calendaring support for Exchange Server 2007+ via Exchange Web Services.
+
+University of Oslo (uio.no), Norway - SIP Max-Forwards setting support (developed by oej)
+
+FCCN, Lissabon, Portugal - SIP show channels CLI command (developed by oej)
+
+Viagenie, Canada - IPv6 support in socket layers and SIP implementation
+       Developers: Marc Blanchet, Simon Perreault and Jean-Philippe Dionne
+
+ClearIT AB, Sweden - res_mutestream, queue_exists and various other patches (developed by oej)
+
+Despegar.com, Argentina - AstData API implementation, also sponsored by Google as part of the
+       gsoc/2009 program (developed by Eliel)
+
+Philippe Lindheimer - DEV_STATE additions to CCSS
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt
@@ -176,7 +235,7 @@ Brian M. Clapper - poll.c emulation
        This product includes software developed by Brian M. Clapper <bmc(AT)clapper.org>
 
 === HOLD MUSIC ===
-Music provided by www.freeplaymusic.com
+Music provided by www.opsound.org
 
 === OTHER SOURCE CODE IN ASTERISK ===
 Asterisk uses libedit, the lightweight readline replacement from NetBSD.