]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Thu, 28 Nov 2013 12:53:00 +0000 (13:53 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Thu, 28 Nov 2013 12:53:00 +0000 (13:53 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge