]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Mon, 24 Jun 2013 19:50:19 +0000 (16:50 -0300)
committerFelipe Pena <felipensp@gmail.com>
Mon, 24 Jun 2013 19:50:19 +0000 (16:50 -0300)
* PHP-5.5:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN


Trivial merge