Bug 7143: Updating history and about file

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

diff --git a/docs/history.txt b/docs/history.txt
index e50d30a..4a58f9d 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -586,9 +586,9 @@ November 9 2011     Koha 3.4.6 released     releases
 November 21 2011       Plea for help from Horowhenua Library Trust (Koha TM in NZ)
 November 29 2011       Koha 3.6.1 released     releases
 December 4 2011        Koha 3.2.11 released    releases
-December 6 2011        Martin Renvoize becomes the 161th developer to have a patch pushed
-December 6 2011        Adrien Saurat becomes the 162th developer to have a patch pushed
-December 6 2011        Albert Oller becomes the 163th developer to have a patch pushed
+December 6 2011        Martin Renvoize becomes the 161st developer to have a patch pushed
+December 6 2011        Adrien Saurat becomes the 162nd developer to have a patch pushed
+December 6 2011        Albert Oller becomes the 163rd developer to have a patch pushed
 December 7 2011        Jon Aker becomes the 164th developer to have a patch pushed
 December 7 2011        Koha 3.4.7 released     releases
 December 13 2011       Fabio Tiana becomes the 165th developer to have a patch pushed
@@ -601,10 +601,10 @@ January 17 2012   Sam Sanders becomes the 170th developer to have a patch pushed (
 January 18 2012        Olivier Crouzet becomes the 171st developer to have a patch pushed
 January 27 2012        Koha 3.6.3 released     releases
 January 27 2012        Koha 3.4.8 released     releases
-January 31 2012        Bart Jorgensen becomes the 172st developer to have a patch pushed
-January 31 2012        Kate Henderson becomes the 173st developer to have a patch pushed
-January 31 2012        Jono Mingard becomes the 174st developer to have a patch pushed
-January 31 2012        Jorgia Kelsey becomes the 175st developer to have a patch pushed
+January 31 2012        Bart Jorgensen becomes the 172nd developer to have a patch pushed
+January 31 2012        Kate Henderson becomes the 173rd developer to have a patch pushed
+January 31 2012        Jono Mingard becomes the 174th developer to have a patch pushed
+January 31 2012        Jorgia Kelsey becomes the 175th developer to have a patch pushed
 February 1 2012        Aleksa Vujicic becomes the 176th developer to have a patch pushed
 February 1 2012        Peter Lorimer becomes the 177th developer to have a patch pushed
 March 4 2012   Koha 3.6.4 released     releases
@@ -612,15 +612,19 @@ March 16 2012     David Cook becomes the 178th developer to have a patch pushed
 March 20 2012  Gaetan Boisson becomes the 179th developer to have a patch pushed
 April 15 2012  Marc Veron becomes the 180th developer to have a patch pushed
 April 22 2012  Koha 3.8.0 released     releases
-May 11 2012    Lyon 3 team becomes the 181th developer to have a patch pushed
+May 11 2012    Lyon 3 team becomes the 181st developer to have a patch pushed
 May 22 2012    Koha 3.8.1 released     releases
 May 25 2012    Koha 3.6.5 released     releases
-May 28 2012    Simon Story becomes the 182th developer to have a patch pushed
+May 28 2012    Simon Story becomes the 182nd developer to have a patch pushed
 May 28 2012    Piotr Kowalski becomes the 183th developer to have a patch pushed
 June 5-7 2012  Kohacon12 in Edinburgh
 June 9-11 2012 Kohacon12 hackfest in Edinburgh
 June 10 2012   Shari Perkins becomes the 184th developer to have a patch pushed
 June 20 2012   Claire Hernandez becomes the 185th developer to have a patch pushed
 June 22 2012   Koha 3.8.2 released     releases
-July 3 2012     Mark Tompsett becomes the 186th developer to have a patch pushed
+June 23 2012   Koha 3.6.6 released     releases
+July 3 2012    Mark Tompsett becomes the 186th developer to have a patch pushed
 July 7 2012    Stacey Walker becomes the 187th developer to have a patch pushed
+July 7 2012    Mirko Tietgen becomes the 188th developer to have a patch pushed
+July 22 2012   Koha 3.8.3 released     releases
+July 22 2012   Koha 3.6.7 released     releases
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 34f6578..11d6834 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -145,9 +145,9 @@
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614275">Henri-Damien Laurent</a> (Koha 3.0 Release Maintainer)</li>
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609147">Owen Leonard</a> (Koha 3.x Interface Design)</li>
                <li><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a> (Koha 3.2, 3.4 Release Maintainer, Koha 3.6 Release Maintainer)</li>
-               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer, Koha 3.8 Release Manager)</li>
+               <li><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer, Koha 3.8 Release Manager, Koha 3.10 Release Manager)</li>
                <li><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a> (Koha 2.0 Release Maintainer)</li>
-                <li>Ian Walls Koha 3.6 QA Manager, Koha 3.8 QA Manager</li>
+                <li>Ian Walls Koha 3.6 QA Manager, Koha 3.8 QA Manager, Koha 3.10 QA Manager</li>
                 </ul>
             <h2>Koha development team</h2>
             <ul>
@@ -310,6 +310,7 @@
                 <li>Adam Thick</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609107">Finlay Thompson</a></li>
                 <li>Fabio Tiana</li>
+        <li>Mirko Tietgen</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692101577">Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</a></li>
                 <li>Bruno Toumi</li>
                 <li>Andrei V. Toutoukine</li>
@@ -318,7 +319,7 @@
                 <li>Marc Veron</li>
                 <li>Aleksa Vujicic</li>
                 <li>Reed Wade</li>
-        <li>Stacey Walker</li>
+                <li>Stacey Walker</li>
                 <li>Ian Walls</li>
                 <li><a href="http://www.ohloh.net/accounts/janewagner">Jane Wagner</a></li>
                 <li>Ward van Wanrooij</li>