]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fa7e89 43cbec0)
Merge branch 'master' of git.php.net:php-src
authorRasmus Lerdorf <rasmus@php.net>
Sat, 3 Aug 2013 16:15:16 +0000 (12:15 -0400)
committerRasmus Lerdorf <rasmus@php.net>
Sat, 3 Aug 2013 16:15:16 +0000 (12:15 -0400)
* 'master' of git.php.net:php-src:
  Fix phar phpinfo test after markup changes


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