]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorMichael Wallner <mike@php.net>
Wed, 30 Jul 2014 18:13:39 +0000 (20:13 +0200)
committerMichael Wallner <mike@php.net>
Wed, 30 Jul 2014 18:13:39 +0000 (20:13 +0200)
* PHP-5.5:
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).


Trivial merge