Bug 6350 Updating history

diff --git a/docs/history.txt b/docs/history.txt
index 5b2c29f..6600a4f 100644 (file)
--- 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 d8e1a69..4f2adc0 100644 (file)
--- 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>