Merge branch 'master' of https://git.php.net/repository/web/php

EliW · EliW · commit 60f577005830 · 2016-08-23T10:43:26.000-04:00
diff --git a/archive/entries/2016-08-22-1.xml b/archive/entries/2016-08-22-1.xml
@@ -31,4 +31,3 @@
     </div>
   </content>
 </entry>
->>>>>>> pull-request/119
