]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Wed, 28 Mar 2012 23:16:20 +0000 (16:16 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 28 Mar 2012 23:16:20 +0000 (16:16 -0700)
commit4b72d505ae54fe3f2a7106c755f985ad9ee7baa5
tree87887385d00a5a6155cce81bc81e216d4f16b269
parent92bca7436fe00f3eb3230f8d42dd2f2b3016574b
parent08089ebe16b0dffacb15b1669bc6c3a8432dcb1c
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Refactoring junit logger. Added generation of nested testsuites in junit.xml.