Skip to content

Commit

Permalink
Merge branch 'PHP-5.4' into PHP-5.5
Browse files Browse the repository at this point in the history 
* PHP-5.4:
  5.4.25 next

Conflicts:
	configure.in
	main/php_version.h
  • Loading branch information
@smalyshev
smalyshev committed Dec 25, 2013
2 parents 3f7a145 + 8e5048f commit a2503c6
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit a2503c6

Please sign in to comment.