Merge branch 'PHP-5.6'

diff --cc ext/date/lib/parse_tz.c
index 0205aaf2da35fd67e885d5ae00f081194cd37583,4350b3a984d3035267d267fa314d20597dc9bb4c..1d873fad6a793f18122f58c7bd885db081571c50
--- 1/ext/date/lib/parse_tz.c
--- 2/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@@ -49,11 -49,14 +49,14 @@@
  #define timelib_conv_int(l) ((l & 0x000000ff) << 24) + ((l & 0x0000ff00) << 8) + ((l & 0x00ff0000) >> 8) + ((l & 0xff000000) >> 24)
  #endif
  
- static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
+ static int read_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
  {
-       /* skip ID */
+       uint32_t version;
+ 
+       /* read ID */
+       version = (*tzf)[3] - '0';
        *tzf += 4;
 -      
 +
        /* read BC flag */
        tz->bc = (**tzf == '\1');
        *tzf += 1;