Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Tue, 8 Oct 2013 17:21:10 +0000 (10:21 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 8 Oct 2013 17:21:10 +0000 (10:21 -0700)
commitfe650a43ed910c7af4c50a972e6fcb1135a6e1db
tree8d0a737dc99273b2b3b600cff3b4c75501374719
parent0117eb747e1b36a301d58fa29aa3ae48b5aa2ac7
parentf32d2ac3aaa7d4af7c348b00ebebb9ae64955704
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Michael Wallner
# Via Michael Wallner
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  fix bug #51076 (race condition in shtool's mkdir -p)