From: Anatol Belski <ab@php.net>
Date: Thu, 27 Feb 2014 08:26:48 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~170
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=703154321fa72c1604b4fe8adefd899a34138800;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update libs_version.txt

Conflicts:
	win32/build/libs_version.txt
---

703154321fa72c1604b4fe8adefd899a34138800