Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Fri, 22 Jun 2012 15:33:22 +0000 (17:33 +0200)
committerJohannes Schlüter <johannes@php.net>
Fri, 22 Jun 2012 15:33:22 +0000 (17:33 +0200)
commit5e23a047acf7b27fff20381d460fcd699731e9a5
tree52c37f399d35b99db5e3abfb1e4a0dfb1c063092
parent4af92aca872d7463b671c037f9d3b782e22a7c9c
parenta62d4e2c43a41a2864e9b38836170e2d4f34033f
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Remove extra ;
ext/odbc/php_odbc.c
ext/pdo_mysql/pdo_mysql.c
ext/session/session.c
ext/standard/browscap.c