]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Mon, 1 Oct 2012 02:28:42 +0000 (19:28 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Oct 2012 02:28:42 +0000 (19:28 -0700)
commit815248d8fb9747ed70af11b387c7d64e995c78e8
tree4c92079887cf0300fbf497deebdb90ca94077115
parentf8d1fc62fabddc7325e8785278d9a04a1724ae8f
parent457844a2266b30c2d0e4090175ce89744a588fc1
Merge branch 'PHP-5.4'

* PHP-5.4:
  add bug #63162
  fix test and move to proper place
  synergy ftl. Removed duplicate fields.
  adding test phpt
  Bug #63162 - parse_url does not matches password component
  fix news