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

author	Chris Cormack <chrisc@catalyst.net.nz>
	Mon, 21 Mar 2011 06:54:11 +0000 (19:54 +1300)
committer	Chris Cormack <chrisc@catalyst.net.nz>
	Mon, 21 Mar 2011 06:54:11 +0000 (19:54 +1300)
commit	03890c90ac41f66b2de04d0280e2e96a0d2e8be8
tree	b841771ec156d90dcaca365cc4b8cebedab92765	tree \| snapshot
parent	bd151a4fd8685e60f9d325a5916e320dfb470122	commit \| diff
parent	c523ae2d646350996efa9cfc1e6149e1f1fac722	commit \| diff

Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
installer/data/mysql/en/mandatory/sysprefs.sql

Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git

C4/Auth.pm	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/pl-PL/mandatory/sysprefs.sql	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql	diff1 \|	diff2 \|	blob \| history
koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc	diff1 \|	diff2 \|	blob \| history