From: Christopher Jones <sixd@php.net>
Date: Sat, 21 Sep 2013 00:09:53 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~211^2~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c175617b800536c08b593cf080f8120623cc009e;p=php

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

# By Adam Harvey (1) and Anatol Belski (1)
# Via Adam Harvey (3) and others
* 'master' of https://git.php.net/repository/php-src:
  Fix the broken sh syntax in ext/imap/config.m4.
  Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
---

c175617b800536c08b593cf080f8120623cc009e