Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Fix handling of double keys in array_column

Also fix resource test to not localize __FILE__ to cwd.
overflow2 is not exported by system libgd
Merge branch 'PHP-5.5'

* PHP-5.5:
  overflow2 is not exported by system libgd
temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
Merge branch 'PHP-5.5'

* PHP-5.5:
  temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
- Updated to version 2013.3 (2013c)
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Fixed stream_socket_pair() on Windows x64 and

improved errorhandling in the socketpair() implementation.
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed stream_socket_pair() on Windows x64 and
updated NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and
updated NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix handling of double keys in array_column
Harden array_column_basic.phpt against resource renumbering.

We don't care what resource number it is, so long as there's a
stream resource returned.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Harden array_column_basic.phpt against resource renumbering.
Allow array_column() to take -1 as a valid value in third param

Also do some cleanup and simplification to make this code more
readable in the long term.