Jordi Boggiano 6c4357a7ed Merge branch 'master' into 2.0 %!s(int64=6) %!d(string=hai) anos
..
Event.php 369e8a2247 Fix indenting %!s(int64=6) %!d(string=hai) anos
ScriptEvents.php dad7f89fd5 Fix docs, fixes #6136 %!s(int64=8) %!d(string=hai) anos