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	Chris Hall <followingthepath@gmail.com>
	Sun, 15 Sep 2013 08:06:39 +0000 (20:06 +1200)
commit	f33d780e8b52be7f3146db4758a93e95f8d39137
tree	882dfdf405c27771ee571e1fe27a201c01f4cd23	tree \| snapshot
parent	6ce4afe5e3101aefe1736c41800887864e052779	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)
Signed-off-by: Chris Hall <followingthepath@gmail.com>
(cherry picked from commit 3dec7977189b7b8549128e4fec151b7a654d2a3a)

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