... and move mw1.16 into trunk

git-svn-id: svn+ssh://svn.wikia-code.com/svn/wikia/trunk@31448 e846bd91-c042-42a7-a218-4b65e2c1904d

CREDITS

@@ -1,4 +1,4 @@
-MediaWiki 1.15 is a collaborative project released under the
+MediaWiki 1.16 is a collaborative project released under the
 GNU General Public License v2. We would like to recognize the
 following names for their contribution to the product.
 
@@ -14,24 +14,30 @@ following names for their contribution to the product.
 * Bryan Tong Minh
 * Chad Horohoe
 * Charles Melbye
+* church of emacs
 * Daniel Friesen
 * Daniel Kinzler
 * Danny B.
 * David McCabe
 * Derk-Jan Hartman
 * Domas Mituzas
+* Emufarmers
 * Fran Rogers
 * Greg Sabino Mullane
 * Guy Van den Broeck
+* Happy-melon
 * Hojjat
 * Ilmari Karonen
 * Jack D. Pond
 * Jack Phoenix
 * Jason Richey
 * Jon Harald Søby
+* Juliano F. Ravasi
 * Leon Weber
 * Marco Schuster
+* Matěj Grabovský
 * Matt Johnston
+* Max Semenik
 * Meno25
 * MinuteElectron
 * Mohamed Magdy
@@ -41,55 +47,76 @@ following names for their contribution to the product.
 * Platonides
 * Purodha Blissenbach
 * Raimond Spekking
+* Remember the dot
 * Roan Kattouw
 * Robert Stojnić
 * Rotem Liss
 * Ryan Lane
 * Ryan Schmidt
+* Sam Reed
 * Shinjiman
 * Siebrand Mazeland
 * SQL
 * Soxred93
 * Thomas Bleher
 * Tim Starling
+* Tom Gries
 * Victor Vasiliev
 
 == Patch Contributors ==
 * Agbad
+* Ahmad Sherif
+* Antonio Ospite
+* Azliq7
+* Borislav Manolov
 * Brad Jorsch
 * Brent G
 * Brianna Laugher
 * Carlin
-* church of emacs
+* Conrad Irwin
+* Dan Nessett
 * Daniel Arnold
-* Danny B.
+* Denny Vrandecic
+* Derk-Jan Hartman
 * FunPika
-* Happy-melon
+* Ireas
 * Jeremy Baron
 * Jidanni
-* Juliano F. Ravasi
+* Jimmy Xu
+* Karun Dambietz
+* Kim Hyun-Joon
+* liangent
 * Lucas Garczewski
 * Louperivois
 * Luigi Corsaro
 * Manuel Menal
 * Marcin Cieślak
+* Marcus Buck
 * Marooned
-* Max Semenik
+* Matthew Britton
+* mati
+* Max Sikström
 * Michael De La Rue
 * Michael Walsh
 * Mike Horvath
 * Mormegil
+* MrPete
 * Nakon
 * Nathan Larson
+* nephele
 * Nikolaos S. Karastathis
 * Olaf Lenz
 * Paul Copperman
-* RememberTheDot
+* PieRRoMaN
 * René Kijewski
+* Robert Treat
+* RockMFR
 * ST47
+* Scott Colcord
 * Simon Walker
 * Stefano Codari
 * Str4nd
+* svip
 
 == Translators ==
 * Anders Wegge Jakobsen

FAQ

@@ -1,5 +1,2 @@
-The original MediaWiki FAQ can be found at
-http://meta.wikimedia.org/wiki/MediaWiki_FAQ.
-
-A newer version is available at
-http://www.mediawiki.org/wiki/Manual:FAQ.
+The MediaWiki FAQ can be found at:
+http://www.mediawiki.org/wiki/Manual:FAQ