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 2b8ef5f99abe7cbd959c795b8d9318e95f5eef3d..9c611e7ac6efb2f2c9b2aaf627f94bcc89f63d78 100644 (file)
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -15,14 +15,14 @@ CiviDesk - Nicolas Ganivet
 CiviHosting - Hershel Robinson
 Community Builders
 Compucorp
-Confluence - Frank Gomez
 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
@@ -41,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
 
 
@@ -81,7 +81,6 @@ Lisa Jervis
 Mathieu Lutfy
 Matt Neimayer
 Micah Lee
-Michael Daryabeygi
 Michael McAndrew
 Nicolas Ganivet
 Noah Miller