granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e7d921f b3b25e1)

author	Michael Wallner <mike@php.net>
	Wed, 30 Jul 2014 18:14:40 +0000 (20:14 +0200)
committer	Michael Wallner <mike@php.net>
	Wed, 30 Jul 2014 18:14:40 +0000 (20:14 +0200)
commit	03f56152e526c994a8ea6038cc8bb9b1ea8214cb
tree	232847cf7f60dce93e240487be135fa38635d6d5	tree \| snapshot
parent	e7d921fd0b433b832542552b871f538d7b6d21f1	commit \| diff
parent	b3b25e1b7015b5f241dda87ca710350594cf806f	commit \| diff

Merge branch 'PHP-5.6'

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

sapi/milter/php_milter.c

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