From: Anatol Belski <ab@php.net>
Date: Thu, 6 Feb 2014 08:17:29 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha2~1^2~9^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8605702a7a7e0afe7ab9ae49404f3cabcb86fa08;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update libs_version.txt

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

8605702a7a7e0afe7ab9ae49404f3cabcb86fa08