]> granicus.if.org Git - php/commit
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
authorBob Weinand <bobwei9@hotmail.com>
Mon, 26 Jan 2015 21:51:37 +0000 (22:51 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Mon, 26 Jan 2015 21:51:37 +0000 (22:51 +0100)
commit666cb333f725794892df7876889472aeee8e33fe
tree9fbe2a6bdfda79bca26672e8f15cbf0b403a5eba
parent168877bc78376fe7c0e3130c5305c66d2865eb38
parent3f57663b571c94db9583c805212eb4e465f13c0f
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6

Conflicts:
NEWS
NEWS