Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-07-14-13-42-39

[civicrm-core.git] / CONTRIBUTORS.txt

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index e0ac3485a27de8ec3a7c04ad781b530a48a8903f..9c611e7ac6efb2f2c9b2aaf627f94bcc89f63d78 100644 (file)
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -1,39 +1,28 @@
 The following people and organizations sponsored and/or contributed new and improved features to the project.
 
-************************************************
-CiviCRM Team
-************************************************
-Coleman Watts
-David Greenberg
-Deepak Srivastava
-Donald Lobo
-Kurund Jalmi
-Michael McAndrew
-Pratik Joshi
-Ravish Nair
-Tim Otten
-Yashodha Chaku
-
 ************************************************
 Key Contributors and Sponsors for 4.3
 ************************************************
 
+CiviCRM Team - Coleman Watts, David Greenberg, Deepak Srivastava, Donald Lobo,
+               Kurund Jalmi, Michael McAndrew, Pratik Joshi, Ravish Nair,
+               Tim Otten, Yashodha Chaku, Eileen McNaughton
 AGH Strategies - Andrew Hunt
 Backoffice Thinking
 Chris Burgess
-Circle Intergactive - Andrew Walker, Dave Moreton
+Circle Interactive - Andrew Walker, Dave Moreton
 CiviDesk - Nicolas Ganivet
 CiviHosting - Hershel Robinson
 Community Builders
 Compucorp
-Confluence - Frank Gomez
-Dave Dantowitz
+Dave D
 EE-atWork - Erik Hommel
 Electronic Frontier Foundation - Micah Lee, Kellie Brownell
 Emphanos - Allen Shaw
 Fuzion, NZ - Eileen McNaughton, Peter Davis, Torrance Hodgeson
+Ginkgo Street Labs - Frank J. Gómez, Michael Daryabeygi
 Jim Meehan
-JMA Consulting - Joe Murray
+JMA Consulting - Joe Murray, Pradeep Nayak
 Keith Morgan
 Ken West
 Korlon - Stuart Gaston
@@ -52,7 +41,7 @@ San Francisco Baykeeper - Eliet Henderson
 Tech to the People - Xavier Dutoit
 Third Sector Design
 Veda Consulting - Parvez Saleh
-Web Access - Pradeep Nayak
+Web Access
 Zing - Simon West, Andrew Tombs
 
 
@@ -92,7 +81,6 @@ Lisa Jervis
 Mathieu Lutfy
 Matt Neimayer
 Micah Lee
-Michael Daryabeygi
 Michael McAndrew
 Nicolas Ganivet
 Noah Miller