Conflicts:
	Docs/Files/IncludingFileStandard.xml
	Docs/Files/LineLengthStandard.xml
	Docs/Functions/FunctionCallArgumentSpacingStandard.xml
	Docs/Functions/FunctionCallSignatureStandard.xml
	Docs/Functions/ValidDefaultValueStandard.xml
	Docs/NamingConventions/ValidClassNameStandard.xml
	Docs/NamingConventions/ValidFunctionNameStandard.xml
	README.txt
	Sniffs/Array/ArraySniff.php
	Sniffs/Classes/ClassCreateInstanceSniff.php
	Sniffs/Classes/ClassDeclarationSniff.php
	Sniffs/Commenting/ClassCommentSniff.php
	Sniffs/Commenting/FileCommentSniff.php
	Sniffs/Commenting/FunctionCommentSniff.php
	Sniffs/Commenting/InlineCommentSniff.php
	Sniffs/ControlStructures/ControlSignatureSniff.php
	Sniffs/ControlStructures/ElseIfSniff.php
	Sniffs/ControlStructures/InlineControlStructureSniff.php
	Sniffs/ControlStructures/MultiLineConditionSniff.php
	Sniffs/Files/IncludingFileSniff.php
	Sniffs/Files/LineEndingsSniff.php
	Sniffs/Files/LineLengthSniff.php
	Sniffs/Formatting/ItemAssignmentSniff.php
	Sniffs/Formatting/MultiLineAssignmentSniff.php
	Sniffs/Formatting/SpaceAfterCastSniff.php
	Sniffs/Formatting/SpaceOperatorSniff.php
	Sniffs/Formatting/SpaceUnaryOperatorSniff.php
	Sniffs/Functions/FunctionCallArgumentSpacingSniff.php
	Sniffs/Functions/FunctionCallSignatureSniff.php
	Sniffs/Functions/FunctionDeclarationSniff.php
	Sniffs/Functions/ValidDefaultValueSniff.php
	Sniffs/NamingConventions/ValidClassNameSniff.php
	Sniffs/NamingConventions/ValidFunctionNameSniff.php
	Sniffs/NamingConventions/ValidVariableNameSniff.php
	Sniffs/Strings/ConcatenationSpacingSniff.php
	Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php
	Sniffs/WhiteSpace/ScopeClosingBraceSniff.php
	Sniffs/WhiteSpace/ScopeIndentSniff.php
	ruleset.xml