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

author	Paul Poulain <paul.poulain@biblibre.com>
	Tue, 20 Mar 2012 14:03:15 +0000 (15:03 +0100)
committer	Paul Poulain <paul.poulain@biblibre.com>
	Tue, 20 Mar 2012 14:03:15 +0000 (15:03 +0100)
commit	c9d0c168679d6b225e305b45331e1e86ee4939d1
tree	38f91ac55e191eb2af004f9499c4a99ea0c3396d	tree \| snapshot
parent	c6746ff4a33bcfbe317e7ad7039a35e14ff097e1	commit \| diff
parent	932296415b74702ca759892fa019ee252437b78a	commit \| diff

Merge remote-tracking branch 'origin/new/bug_7408'

Conflicts:
installer/data/mysql/sysprefs.sql