Merge release-2.x.y

1 files changed, 9 insertions, 1 deletions

diff --git a/COPYRIGHT b/COPYRIGHT
index 93ff039941..49c78afada 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -15,7 +15,7 @@ If concerns are raised as to the copyright holder of a particular
 piece of code, then that code should be traced through our version
 control system to see from where it came and who has modified it.
 
-Copyright (C) 1998-2013 by the following:
+Copyright (C) 1998-2014 by the following:
 
 Mark
 Saleem Abdulrasool
@@ -25,6 +25,7 @@ Thijs Alkemade
 Manuel Amador
 Matt Amato
 Josef Andrysek
+Flavius Anton
 Geoffrey Antos
 Daniel Atallah
 Paul Aurich
@@ -54,6 +55,7 @@ Matthew W.S. Bell
 Igor Belyi
 David Benjamin
 Brian Bernas
+Vivien Bernet-Rollande
 Paul Betts
 Runa Bhattacharjee
 Jonas Birmé
@@ -110,6 +112,7 @@ Patrick Cheung
 Ka-Hing Cheung
 Sadrul Habib Chowdhury
 Brian Chu
+Howard Chu
 Arturo Cisneros, Jr.
 Vincas Ciziunas
 Jonathan Clark
@@ -259,6 +262,7 @@ Instant Messaging Freedom, Inc.
 Vitaliy Ischenko
 Intel Corporation
 Andrew Ivanov
+Momchil Ivanov
 Scott Jackson
 Hans Petter Jansson
 David Jedelsky
@@ -425,6 +429,7 @@ Eric Polino <aluink@gmail.com>
 Ari Pollak
 Stephen Pope
 Cristi Posoiu
+Alexei Potashnik
 Nathan Poznick
 Jory A. Pratt
 David Preece
@@ -442,6 +447,7 @@ Etan Reisner
 David Reiss
 Luoh Ren-Shan
 Noa Resare
+Tim Retout
 Daniele Ricci
 Kristian Rietveld
 Pekka Riikonen
@@ -545,6 +551,7 @@ Arun A. Tharuvai
 Cestonaro Thilo
 Will Thompson
 Douglas Thrift (douglaswth)
+Niels Thykier
 Mark Tiefenbruck
 Andrew Tinney
 Jeffery To
@@ -572,6 +579,7 @@ Martijn van Beers
 Gideon van Melle
 Arjan van de Ven
 Philip Van Hoof
+Ankit Vani
 Kristof Vansant
 James Vega
 David Vermeille