Merge branch 'PHP-5.6'

* PHP-5.6: Added info about ext/opcache Conflicts: EXTENSIONS
Sannis · Oct 8, 2014 · 320b9ef · 320b9ef
2 parents 7fd3375 + aec5191
commit 320b9ef
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/EXTENSIONS b/EXTENSIONS
@@ -421,6 +421,12 @@ PRIMARY MAINTAINER:  Derick Rethans <[email protected]>
 MAINTENANCE:         Maintained
 STATUS:              Working
 -------------------------------------------------------------------------------
+EXTENSION:           opcache
+PRIMARY MAINTAINER:  Dmitry Stogov <[email protected]>, Xinchen Hui <[email protected]>
+MAINTENANCE:         Maintained
+STATUS:              Working
+SINCE:               5.5.0
+-------------------------------------------------------------------------------
 EXTENSION:           openssl
 PRIMARY MAINTAINER:  Wez Furlong <[email protected]>, Pierre-Alain Joye <[email protected]>
 MAINTENANCE:         Maintained