Commit [e3fad4]  Maximize  Restore  History

Merge branch 'master' into wip/better-php-parser

Colomban Wendling Colomban Wendling 2013-07-03