]> granicus.if.org Git - php/commitdiff
Merge branch 'pull-request/805'
authorAnatol Belski <ab@php.net>
Sat, 20 Sep 2014 17:46:44 +0000 (19:46 +0200)
committerAnatol Belski <ab@php.net>
Sat, 20 Sep 2014 17:46:44 +0000 (19:46 +0200)
* pull-request/805:
  Removes accidentally added files.
  Reverts some unwanted changes
  Deletes patch leftovers
  Replaces php5 with php7, without whitespace changes.


Trivial merge