bug 7143: add latest batch of committers

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit ee224415b7c8b5e31f9c052e1c14a143ab137898)
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 11ad663a50979c2aa20aabaa986a8660381f37c0)

Conflicts:

	koha-tmpl/intranet-tmpl/prog/en/modules/about.tt

Solved minor conflict.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
(cherry picked from commit 11ad663a50979c2aa20aabaa986a8660381f37c0)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 3dec7977189b7b8549128e4fec151b7a654d2a3a)

diff --git a/docs/history.txt b/docs/history.txt
index 83948fa..0d3949c 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -679,3 +679,6 @@ June 23 2013        Koha 3.12.1 released    releases
 June 23 2013   Koha 3.10.7 released    releases
 June 23 2013   Koha 3.8.14 released    releases
 July 7 2013    Silvia Simonetti becomes the 213th developer to have a patch pushed
+July 8 2013    Sonia Lemaire becomes the 214th developer to have a patch pushed
+July 15 2013   Kenza Zaki becomes the 215th developer to have a patch pushed
+July 15 2013   Jason Etheridge becomes the 216th developer to have a patch pushed

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index ae390ad..1c79d85 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -183,6 +183,7 @@
                 <li>Brian Engard</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
                 <li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
+                <li>Jason Etheridge</li>
                 <li>Shaun Evans</li>
                 <li>Pat Eyler (Kaitiaki from 2002 to 2004)</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
@@ -228,6 +229,7 @@
                 <li>Rafal Kopaczka</li>
                 <li>Piotr Kowalski</li>
                 <li>Arnaud Laurin</li>
+                <li>Sonia Lemaire</li>
                 <li>Ambrose Li (translation tool)</li>
                 <li>Gynn Lomax</li>
                 <li>Robert Lyon (Corporate Serials)</li>
@@ -310,6 +312,8 @@
                 <li>Robert Williams</li>
                 <li>James Winter</li>
                 <li>Lars Wirzenius</li>
+                <li>Jen Zajac</li>
+                <li>Kenza Zaki</li>
             </ul>
             <h3>Contributing companies and institutions</h3>
             <ul>