]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 948f361 c981016)
Merge branch 'PHP-5.3' into PHP-5.4
authorAnatoliy Belsky <ab@php.net>
Mon, 16 Apr 2012 11:42:52 +0000 (13:42 +0200)
committerAnatoliy Belsky <ab@php.net>
Mon, 16 Apr 2012 11:42:52 +0000 (13:42 +0200)
* PHP-5.3:
  Fix bug 61676 ext\tidy\tests\bug54682.phpt fails

Conflicts:
ext/tidy/tests/bug54682.phpt


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