# Conflicts:
#	VERSIONS
#	cosmogramme/php/_init.php
#	cosmogramme/sql/patch/patch_232.php
#	library/Class/TypeDoc.php
#	library/Class/UserGroup.php
#	library/startup.php
#	tests/library/Class/UserGroupTest.php