]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Mon, 21 Jul 2014 08:01:48 +0000 (10:01 +0200)
committerAnatol Belski <ab@php.net>
Mon, 21 Jul 2014 08:01:48 +0000 (10:01 +0200)
commit833e4669832137edbc4526a0d7c10f16396554a0
tree8e23f226124311a96e2ca503a078b3248b368be5
parent128eda843f7dff487fff529a384fee3c5494e0f6
parentf6d941e4b451a09c80e852a2f9d54e41591c36d2
Merge branch 'PHP-5.6'

* PHP-5.6:
  force atoll macro usage on windows