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

author	Paul Poulain <paul.poulain@biblibre.com>
	Fri, 6 Jan 2012 10:03:25 +0000 (11:03 +0100)
committer	Paul Poulain <paul.poulain@biblibre.com>
	Fri, 6 Jan 2012 10:03:25 +0000 (11:03 +0100)
commit	7ea4760b06fa90314f0f7d8d165029100b804f02
tree	0becb1dd940ec8690a75380bc887b80abfce1ac0	tree \| snapshot
parent	2202ee78c3abf41aa46d131036b1a4162c8faf35	commit \| diff
parent	f84c19fa70323b4fa89c0ff253e381619b7b14f0	commit \| diff

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

Conflicts:
kohaversion.pl