Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Fri, 27 Jun 2014 14:28:24 +0000 (16:28 +0200)
committerFerenc Kovacs <tyrael@php.net>
Fri, 27 Jun 2014 14:28:24 +0000 (16:28 +0200)
commit293a48cb9df040d769e03a8c262e15b9f880333a
tree0559de1b9314ea49609a98ed2921d4c832e79dbe
parent6c72ea87fd5c1155f31bea75c1711e0143bb6447
parentcc22f021fe7c7cf41cd6302374db8eba0f173653
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  removing the format added by mistake, props to Solar Designer for spotting this.