Skip to content
Browse files

Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	configure.in
	main/php_version.h
  • Loading branch information...
2 parents 26e492f + 64c09f6 commit 5bbc489527d9a762fa98cffb353f007d60090a3c @johannes johannes committed
Showing with 0 additions and 0 deletions.

0 comments on commit 5bbc489

Please sign in to comment.
Something went wrong with that request. Please try again.