From: Michael Wallner <mike@php.net>
Date: Mon, 21 Oct 2013 20:16:21 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~227^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfd911473bb6b6a34dffbd7b12b1d97278683264;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
---

cfd911473bb6b6a34dffbd7b12b1d97278683264