Merge branch 'throw-error-in-extensions'

diff --cc ext/date/php_date.c
Simple merge

diff --cc ext/dba/dba.c
Simple merge

diff --cc ext/dom/php_dom.c
Simple merge

diff --cc ext/imap/php_imap.c
Simple merge

diff --cc ext/intl/collator/collator_sort.c
Simple merge

diff --cc ext/intl/transliterator/transliterator_class.c
Simple merge

diff --cc ext/ldap/ldap.c
Simple merge

diff --cc ext/mbstring/php_mbregex.c
Simple merge

diff --cc ext/mcrypt/mcrypt.c
Simple merge

diff --cc ext/reflection/php_reflection.c
Simple merge

diff --cc ext/session/session.c
Simple merge

diff --cc ext/simplexml/simplexml.c
Simple merge

diff --cc ext/spl/spl_array.c
Simple merge

diff --cc ext/spl/spl_directory.c
Simple merge

diff --cc ext/spl/spl_iterators.c
Simple merge

diff --cc ext/standard/assert.c
Simple merge

diff --cc ext/standard/basic_functions.c
Simple merge

diff --cc ext/standard/html.c
Simple merge

diff --cc ext/standard/php_fopen_wrapper.c
Simple merge

diff --cc ext/wddx/wddx.c
Simple merge

diff --cc ext/xmlrpc/xmlrpc-epi-php.c
Simple merge

diff --cc ext/zip/php_zip.c
Simple merge