]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorMichael Wallner <mike@php.net>
Fri, 4 Oct 2013 14:12:23 +0000 (16:12 +0200)
committerMichael Wallner <mike@php.net>
Fri, 4 Oct 2013 14:12:23 +0000 (16:12 +0200)
commitadfb5ab7ced3b0d4456680edb1766f4ad4f279d6
tree63a47cde1bcc758a8eb4b7a1b6717e0b851d6024
parent536260f2c52af7057a657af96d991acf27c0cc86
parente8ae795529eff83482797dff0d1a1de7f0a84c8d
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  such a weird hack probably helps in finding regressions in the future