Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update lib versions

Conflicts:
	win32/build/libs_version.txt

diff --cc win32/build/libs_version.txt
index b4fbfbc0e6ba20db11a7738a1ed6d40619d42035,ec85794c9eaa5c25f9293d6742624e01c4f76ed9..bc15d5b1ccd5f32fc3edc0b3565acb71d0200acf
--- 1/win32/build/libs_version.txt
--- 2/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@@ -1,16 -1,16 +1,16 @@@
  bz2-1.0.6
 -cclient-2007e
 +cclient-2007f
  freetype-2.4.10
 -icu-49.1.2
 -jpeglib-8
 +icu-51.2
 +jpeglib-9a
- libcurl-7.35.0
+ libcurl-7.36.0
  libiconv-1.14
  libmcrypt-2.5.8
 -libmpir-2.5.1
 -libpng-1.2.50
 -libpq-8.3.6
 -libssh2-1.4.2
 -libtidy-20090325
 +libmpir-2.6.0
 +libpng-1.5.18
 +libpq-9.2.2
 +libssh2-1.4.3
 +libtidy-20090406
  libxslt-1.1.27
 -libxml-2.7.8
 -openssl-0.9.8y
 +libxml-2.9.1
 +openssl-1.0.1f