]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
authorChristopher Jones <sixd@php.net>
Sat, 21 Sep 2013 00:09:47 +0000 (17:09 -0700)
committerChristopher Jones <sixd@php.net>
Sat, 21 Sep 2013 00:09:47 +0000 (17:09 -0700)
commit34fc79bd6184a7e9412823e0247a10b8e777c7b0
treede239fd82c83d251d36c05d581a17ec7e6444f0d
parentd5ba2d8a99653521ff6a7997bf9aabe2b016c89a
parentcc66eaa04b123bdfb6aaa7305713fa508640999e
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Adam Harvey
# Via Adam Harvey
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fix the broken sh syntax in ext/imap/config.m4.