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

author	Paul Poulain <paul.poulain@biblibre.com>
	Thu, 8 Dec 2011 09:08:44 +0000 (10:08 +0100)
committer	Paul Poulain <paul.poulain@biblibre.com>
	Thu, 8 Dec 2011 09:08:44 +0000 (10:08 +0100)
commit	b9d743a9281bfd6c853ffaa639577e1801f3b71b
tree	bb28fd33c194b6a4e6c736d76a82e8b6920d8074	tree \| snapshot
parent	4a14e7dbe69db0517d1d333a644c4abeb0a42cb8	commit \| diff
parent	c0234dd9b9649063acf2617fecf5c6efda38a532	commit \| diff

Merge remote-tracking branch 'origin/master' into new/bug_6679

Conflicts:
catalogue/showmarc.pl