Skip to content

Commit 0d65a85

Browse files
smalyshevsmalyshev
committed
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: 5.4.13 branched, now it's 5.4.14 Conflicts: configure.in main/php_version.h
2 parents 84b65cf + 31a6f8b commit 0d65a85

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)