Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 22 Jan 2014 10:53:56 +0000 (11:53 +0100)
committerAnatol Belski <ab@php.net>
Wed, 22 Jan 2014 10:53:56 +0000 (11:53 +0100)
* PHP-5.5:
  fixed missing usleep() prototype in pgsql

1  2 
ext/pgsql/pgsql.c

Simple merge