From 2cea53ba4b6f81df656819dfa04056fa5ffd48a1 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Tue, 5 Jul 2011 15:16:09 +1200
Subject: [PATCH] Bug 6350 Updating history (cherry picked from commit
 1209d9774dd95f0b3467e542d2e8b4bb5ca6f911)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 docs/history.txt                                 | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/history.txt b/docs/history.txt
index 5b2c29fab7..6600a4f89d 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -550,3 +550,4 @@ June 1 2011	Fridolyn Somers becomes the 143rd developer to have a patch pushed
 June 3 2011	Elliott Davis becomes the 144th developer to have a patch pushed
 June 15 2011	First ever global sign off day
 June 17 2011	Jeremy Crabtree becomes the 145th developer to have a patch pushed
+July 5 2011 Francois Marier becomes the 146th 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 d8e1a69f75..4f2adc0737 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -207,6 +207,7 @@
                 <li>Ambrose Li (translation tool)</li>
                 <li>Gynn Lomax</li>
                 <li>Robert Lyon (Corporate Serials)</li>
+                <li>Francois Marier</li>
                 <li>Frère Sébastien Marie</li>
                 <li>Ricardo Dias Marques</li>
 		<li>Julian Maurice</li>
-- 
2.39.5