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

author	Paul Poulain <paul.poulain@biblibre.com>
	Fri, 6 Jan 2012 09:59:05 +0000 (10:59 +0100)
committer	Paul Poulain <paul.poulain@biblibre.com>
	Fri, 6 Jan 2012 09:59:05 +0000 (10:59 +0100)
commit	2202ee78c3abf41aa46d131036b1a4162c8faf35
tree	6eb23b3eab911fa0e10f02a4bdca00215cef9248	tree \| snapshot
parent	236747534115e35975de8d51554e6e87f4248462	commit \| diff
parent	f22781971379824da0f1249fec0beac2478c80e6	commit \| diff

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

Conflicts:
kohaversion.pl