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

author Paul Poulain <paul.poulain@biblibre.com>

Tue, 17 Jan 2012 15:03:14 +0000 (16:03 +0100)

committer Paul Poulain <paul.poulain@biblibre.com>

Tue, 17 Jan 2012 15:03:14 +0000 (16:03 +0100)
author Paul Poulain <paul.poulain@biblibre.com>
Tue, 17 Jan 2012 15:03:14 +0000 (16:03 +0100)
committer Paul Poulain <paul.poulain@biblibre.com>
Tue, 17 Jan 2012 15:03:14 +0000 (16:03 +0100)
diff --cc cataloguing/additem.pl
Simple merge
diff --cc installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
Simple merge
author	Paul Poulain <paul.poulain@biblibre.com>
	Tue, 17 Jan 2012 15:03:14 +0000 (16:03 +0100)
committer	Paul Poulain <paul.poulain@biblibre.com>
	Tue, 17 Jan 2012 15:03:14 +0000 (16:03 +0100)
		1	2
cataloguing/additem.pl	patch \|	diff1 \|	diff2 \|	blob \| history
installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql	patch \|	diff1 \|	diff2 \|	blob \| history