From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 15 Aug 2014 07:13:42 +0000 (+0400)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~58^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d57a7bf34a52618c0b5d3679a522a818b5adcf3;p=php

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Update Version Number :)
  Fixed initializing
  Unused variable

Conflicts:
	main/php_version.h
---

0d57a7bf34a52618c0b5d3679a522a818b5adcf3