From: Christopher Jones <sixd@php.net>
Date: Sat, 21 Sep 2013 00:09:50 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.5RC1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bf997c1dbdc8b5135abfd25ad9911e0d601e8b9;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Adam Harvey (1) and Anatol Belski (1)
# Via Adam Harvey (2) and Christopher Jones (2)
* 'PHP-5.5' 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
---

9bf997c1dbdc8b5135abfd25ad9911e0d601e8b9