]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://github.com/guggemand/php-src
authorMichael Wallner <mike@php.net>
Mon, 21 Oct 2013 10:04:37 +0000 (12:04 +0200)
committerMichael Wallner <mike@php.net>
Mon, 21 Oct 2013 10:04:37 +0000 (12:04 +0200)
* 'master' of https://github.com/guggemand/php-src:
  Dont reset other counters when incrementing slow_rq


Trivial merge