Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -1,10 +1,8 @@
 .cowboy.plt
-.eunit
+.erlang.mk.packages.*
+_rel
 deps
-doc/*.css
-doc/*.html
-doc/*.png
-doc/edoc-info
 ebin
 logs
+relx
 test/*.beam

AUTHORS

@@ -2,26 +2,71 @@ Cowboy is available thanks to the work of:
 
 Loïc Hoguin
 Magnus Klaar
-Anthony Ramine
 Ali Sabil
+Anthony Ramine
+Adam Cammack
 Tom Burdick
+James Fish
 Paul Oliver
-Steven Gravell
+Slava Yurin
+Vladimir Dronnikov
+YAMAMOTO Takashi
 Yurii Rashkovskii
-Hunter Morris
+Andrew Majorov
+Egobrain
+Josh Toft
+Steven Gravell
 Andrew Thompson
+Hunter Morris
+Ivan Lisenkov
+Seletskiy Stanislav
+Tristan Sloughter
+0x00F6
+0xAX
+Adam Cammmack
+Adrian Roe
+Andre Graf
+Andrzej Sliwa
+Blake Gentry
 Bob Ippolito
+Boris Faure
+Cameron Bytheway
+Cristian Hancila
+Danielle Sucher
+Dave Peticolas
 David Kelly
 DeadZen
 Dmitry Groshev
+Eduardo Gurgel
 Hans Ulrich Niedermann
+Ivan Blinkov
+Jeremy Ong
 Jesper Louis Andersen
+Josh Allmann
 Josh Marchán
+José Valim
+Julian Squires
+Kuk-Hyun Lee
 Mathieu Lecarme
+Matthias Endler
 Max Lapshin
 Michiel Hakvoort
 Ori Bar
+Pablo Vieytes
+RJ
+Radosław Szymczyszyn
+Richard Ramsden
 Roberto Ostinelli
+Sergey Prokhorov
+Sergey Rublev
+Sergey Urbanovich
 Seven Du
+Thomas Nordström
 Tim Dysinger
-Alisdair Sullivan
+Unix1
+alisdair sullivan
+dbmercer
+derdesign
+pmyarchon
+rambocoder
+serge