Merge branch 'PHP-5.4' into PHP-5.5
authorLior Kaplan <kaplanlior@gmail.com>
Sun, 24 Aug 2014 21:30:01 +0000 (00:30 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Sun, 24 Aug 2014 21:30:01 +0000 (00:30 +0300)
commitc8b3bce407e7491a4d1e345d3eeb11ce0ec1d9c4
tree7e5e54b3e653c880d387a8dd13f2a54bc1b29d39
parenta90d05a4304a2ef832afe059dc19c7f14ca86f58
parentbda1cc69468c44ada683cfa52350f8bf28a068ec
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>