]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Sat, 21 Dec 2013 23:57:31 +0000 (00:57 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sat, 21 Dec 2013 23:57:31 +0000 (00:57 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge