]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5 (strategy ours)
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 2 Feb 2013 17:40:05 +0000 (18:40 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 2 Feb 2013 17:40:05 +0000 (18:40 +0100)
commit6ba5d0a4a5b714c048e0ded9933bfef2031f17c2
treef585c0d0921a21a1c719e202b2d6175d8ac628d1
parent03b1da5d7ada4a80a91d9953c388fa05f294d711
parent0110662ae9e89d21c119b3287118e82fd435f779
Merge branch 'PHP-5.4' into PHP-5.5 (strategy ours)

* PHP-5.4:
  Move macro back to .c file