Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 8 insertions, 2 deletions

diff --git a/CREDITS b/CREDITS
index c480e737..776e51b3 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,8 +1,11 @@
-MediaWiki 1.22 is a collaborative project released under the
+{{int:version-credits-summary}}
+<!--
+MediaWiki 1.24 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.
-
+-->
 <!-- Please notice that the following can be found parsed under Special:Version/Credits -->
+
 == Developers ==
 * Aaron Schulz
 * Alex Z.
@@ -126,7 +129,9 @@ following names for their contribution to the product.
 * Ebrahim Byagowi
 * Edward Z. Yang
 * Elvis Stansvik
+* Eranroz
 * Erwin Dokter
+* Étienne Beaulé
 * Federico Leva
 * FunPika
 * fomafix
@@ -153,6 +158,7 @@ following names for their contribution to the product.
 * Kim Hyun-Joon
 * Lee Worden
 * Lejonel
+* Leon Liesener
 * liangent
 * Louperivois
 * Lucas Garczewski