]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97f9a67 fba290c)
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Wed, 11 Sep 2013 12:41:00 +0000 (05:41 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 11 Sep 2013 12:41:00 +0000 (05:41 -0700)
* 'master' of https://git.php.net/repository/php-src:
  Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.