Copyright update to 2014.
PSR2: fix newline character being seen as superfluous spacing in multiline control structure
Merge branch 'master' of https://github.com/dmelo/PHP_CodeSniffer
Improved detection of nested IF statements that use the alternate IF/ENDIF syntax
Added branch alias for the 2.0.x version
If an ELSE token is both an opener and closer, but it is followed by an IF, the scope_condition will be unset to allow it to act as an opener, but the condition will never be set again. So added a sanity check for this case.
Fix Squiz.PHP.LowercasePHPFunctionsSniff detecting namespaced classes

Example: Db\Adapter\Pdo\Mysql gets detected as builtin function (mysql)
Fixed bug #20200 : Invalid JSON produced with specific error messag
Fixed bug #20204 : Ruleset exclude checks are case sensitive
Merge branch 'psr2_multiline_controlstructure_fix' of https://github.com/mcuelenaere/PHP_CodeSniffer
Unit test and changelog for PR 188
Added attribution
PHP tokenizer now supports DEFAULT statements opened with a T_SEMICOLON
PSR1 CamelCapsMethodNameSniff now ignores magic methods
PSR1 and PEAR ClassDeclarationSniffs now support traits (request #20208)
Fixed bug #20213 : Invalid error, Inline IF must be declared on single line
Merge branch 'patch-1' of https://github.com/maxgalbu/PHP_CodeSniffer
Unit test + changelog
PSR1 SideEffectsSniff now ignores methods named define()
don't assume numeric line numbers