# Conflicts:
#	VERSIONS
#	cosmogramme/sql/patch/patch_324.php
#	library/Class/Cosmogramme/Integration/Record/Bibliondemand.php
#	library/Class/WebService/SIGB/AbstractILSDIPatronInfoReader.php
#	library/startup.php
#	public/opac/java/mycarousel_vertical/valeurs_properties.html
#	tests/db/UpgradeDBTest.php