[PHP-CVS] com php-src: Merge branch 'master' into str_size_and_int64: Zend/zend_language_scanner.c

[Anatol Belski]

Commit:    e540839c8b283a7b445ab6552f37f3b1ca0f2eaa
Author:    Anatol Belski <a...@php.net>         Mon, 23 Dec 2013 23:39:42 +0100
Parents:   63ea29a2067ce06e20dda861480d91624389f0f3 
392f6830a15aa670d7ad4de173175ed4e482ffdb
Branches:  str_size_and_int64

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=e540839c8b283a7b445ab6552f37f3b1ca0f2eaa

Log:
Merge branch 'master' into str_size_and_int64

Conflicts:
        Zend/zend_vm_execute.h
        ext/opcache/Optimizer/pass1_5.c
        ext/opcache/ZendAccelerator.h

Changed paths:
  MM  Zend/zend_language_scanner.c


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php