git.koha-community.org Git - koha.git/commit

author	Galen Charlton <gmc@esilibrary.com>
	Mon, 22 Jul 2013 14:40:58 +0000 (14:40 +0000)
committer	Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
	Fri, 13 Sep 2013 21:07:13 +0000 (18:07 -0300)
commit	3dec7977189b7b8549128e4fec151b7a654d2a3a
tree	53ee311a69d7bdb4d6cf6fdf276a09a4f3365c71	tree \| snapshot
parent	7b5141e9501550918741b02b55f1b49706240f7b	commit \| diff

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)

docs/history.txt		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt		diff \| blob \| history