Merge branch 'master' into wip/better-php-parser
commite3fad4a745fa2f1c8bbee9620876787f6bb029ca
authorColomban Wendling <ban@herbesfolles.org>
Wed, 3 Jul 2013 17:26:06 +0000 (3 19:26 +0200)
committerColomban Wendling <ban@herbesfolles.org>
Wed, 3 Jul 2013 17:26:06 +0000 (3 19:26 +0200)
treeb35f032293d823ea7a448ad5da7879086971d6c9
parentc986eeee99a103dfa90acd866cb46be6d5c95ed2
parentd1f2005738fbf01694a9fd52521446b0fd755f01
Merge branch 'master' into wip/better-php-parser
src/symbols.c