granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 579c906 12b2127)

author	Michael Wallner <mike@php.net>
	Wed, 30 Jul 2014 18:12:50 +0000 (20:12 +0200)
committer	Michael Wallner <mike@php.net>
	Wed, 30 Jul 2014 18:12:50 +0000 (20:12 +0200)
commit	6ed9991a6f327242a1214a485775a106f5eb015e
tree	ab6c63b9fec394af88f51585591e446b7c98c747	tree \| snapshot
parent	579c9066a0f37144f0be66e0b62431ba15a118be	commit \| diff
parent	12b2127b72543710590887d8bcf26be9e02bcc71	commit \| diff

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67715 (php-milter does not build and crashes randomly).

sapi/milter/config.m4

Unnamed repository; edit this file 'description' to name the repository.