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

author	Paul Poulain <paul.poulain@biblibre.com>
	Fri, 6 Jan 2012 09:52:47 +0000 (10:52 +0100)
committer	Paul Poulain <paul.poulain@biblibre.com>
	Fri, 6 Jan 2012 09:52:47 +0000 (10:52 +0100)
commit	236747534115e35975de8d51554e6e87f4248462
tree	dce174a47a7cfddb668b96b69a357a5a42fe7798	tree \| snapshot
parent	1730e180cdbe11a7878ddfab54cec7291d12f430	commit \| diff
parent	e0095c55852a9c4614ea37df67c4882f9fc3128f	commit \| diff

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

Conflicts:
kohaversion.pl