From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 26 Feb 2006 17:07:17 +0000 (+0000)
Subject: MFB51: Fixed bug #36510 (strtotime() fails to parse date strings with tabs).
X-Git-Tag: RELEASE_1_2~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c722c519f8b32a1bb6d399794ce90fe47a6db1b;p=php

MFB51: Fixed bug #36510 (strtotime() fails to parse date strings with tabs).
---

diff --git a/ext/date/lib/parse_date.c b/ext/date/lib/parse_date.c
index d39dd53b25..a5b3cb35c3 100644
--- a/ext/date/lib/parse_date.c
+++ b/ext/date/lib/parse_date.c
@@ -1,4 +1,8 @@
+<<<<<<< parse_date.c
+/* Generated by re2c 0.9.11 on Sun Feb 26 12:06:27 2006 */
+=======
 /* Generated by re2c 0.9.12 on Fri Feb 24 10:41:53 2006 */
+>>>>>>> 1.55
 #line 1 "ext/date/lib/parse_date.re"
 /*
    +----------------------------------------------------------------------+
@@ -18,7 +22,11 @@
    +----------------------------------------------------------------------+
  */
 
+<<<<<<< parse_date.c
 /* $Id$ */
+=======
+/* $Id$ */
+>>>>>>> 1.55
 
 #include "timelib.h"
 
@@ -537,7 +545,7 @@ static long timelib_get_month(char **ptr)
 
 static void timelib_eat_spaces(char **ptr)
 {
-	while (**ptr == ' ') {
+	while (**ptr == ' ' || **ptr == '\t') {
 		++*ptr;
 	}
 }
@@ -741,13 +749,13 @@ std:
 {
 	static unsigned char yybm[] = {
 	  0,   0,   0,   0,   0,   0,   0,   0, 
+	  0,  16,   0,   0,   0,   0,   0,   0, 
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	  0,   0,   0,   0,   0,   0,   0,   0, 
-	  0,   0,   0,   0,   0,   0,   0,   0, 
-	208,  64,  64,  64,  64,  64,  64,  64, 
+	216,  64,  64,  64,  64,  64,  64,  64, 
 	 64,  64,  64,  64, 192,  64, 192,   0, 
-	  8,   8,   8,   8,   8,   8,   8,   8, 
-	  8,   8,   0,   0,   0,   0,   0,   0, 
+	  4,   4,   4,   4,   4,   4,   4,   4, 
+	  4,   4,   0,   0,   0,   0,   0,   0, 
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	  0,   0,   0,   0,   0,   0,   0,   0, 
 	  0,   0,   0,   0,   0,   0,   0,   0, 
@@ -856,7 +864,11 @@ yy2:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'D')	goto yy133;
+<<<<<<< parse_date.c
+			goto yy1285;
+=======
 			goto yy1310;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'd'){
@@ -864,7 +876,11 @@ yy2:
 			if(yych >= 'a')	goto yy136;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'e')	goto yy1294;
+=======
 			if(yych <= 'e')	goto yy1319;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy136;
 			goto yy3;
 		}
@@ -893,7 +909,11 @@ yy4:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'D')	goto yy133;
+<<<<<<< parse_date.c
+			goto yy1285;
+=======
 			goto yy1310;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'd'){
@@ -901,7 +921,11 @@ yy4:
 			if(yych <= '`')	goto yy3;
 			goto yy133;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'e')	goto yy1285;
+=======
 			if(yych <= 'e')	goto yy1310;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy133;
 			goto yy3;
 		}
@@ -916,12 +940,24 @@ yy5:
 			goto yy133;
 		} else {
 			if(yych <= 'H'){
+<<<<<<< parse_date.c
+				if(yych <= 'E')	goto yy1256;
+=======
 				if(yych <= 'E')	goto yy1281;
+>>>>>>> 1.55
 				goto yy133;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'I')	goto yy1257;
+=======
 				if(yych <= 'I')	goto yy1282;
+>>>>>>> 1.55
 				if(yych <= 'N')	goto yy133;
+<<<<<<< parse_date.c
+				goto yy1255;
+=======
 				goto yy1280;
+>>>>>>> 1.55
 			}
 		}
 	} else {
@@ -930,15 +966,27 @@ yy5:
 				if(yych <= 'Z')	goto yy133;
 				goto yy3;
 			} else {
+<<<<<<< parse_date.c
+				if(yych == 'e')	goto yy1272;
+=======
 				if(yych == 'e')	goto yy1297;
+>>>>>>> 1.55
 				goto yy136;
 			}
 		} else {
 			if(yych <= 'n'){
+<<<<<<< parse_date.c
+				if(yych <= 'i')	goto yy1273;
+=======
 				if(yych <= 'i')	goto yy1298;
+>>>>>>> 1.55
 				goto yy136;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'o')	goto yy1271;
+=======
 				if(yych <= 'o')	goto yy1296;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy136;
 				goto yy3;
 			}
@@ -954,12 +1002,24 @@ yy6:
 			goto yy133;
 		} else {
 			if(yych <= 'H'){
+<<<<<<< parse_date.c
+				if(yych <= 'E')	goto yy1256;
+=======
 				if(yych <= 'E')	goto yy1281;
+>>>>>>> 1.55
 				goto yy133;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'I')	goto yy1257;
+=======
 				if(yych <= 'I')	goto yy1282;
+>>>>>>> 1.55
 				if(yych <= 'N')	goto yy133;
+<<<<<<< parse_date.c
+				goto yy1255;
+=======
 				goto yy1280;
+>>>>>>> 1.55
 			}
 		}
 	} else {
@@ -968,15 +1028,27 @@ yy6:
 				if(yych <= 'Z')	goto yy133;
 				goto yy3;
 			} else {
+<<<<<<< parse_date.c
+				if(yych == 'e')	goto yy1256;
+=======
 				if(yych == 'e')	goto yy1281;
+>>>>>>> 1.55
 				goto yy133;
 			}
 		} else {
 			if(yych <= 'n'){
+<<<<<<< parse_date.c
+				if(yych <= 'i')	goto yy1257;
+=======
 				if(yych <= 'i')	goto yy1282;
+>>>>>>> 1.55
 				goto yy133;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'o')	goto yy1255;
+=======
 				if(yych <= 'o')	goto yy1280;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy133;
 				goto yy3;
 			}
@@ -989,24 +1061,48 @@ yy7:
 		if(yych <= 'A'){
 			if(yych == ')')	goto yy132;
 			if(yych <= '@')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1227;
+=======
 			goto yy1252;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'I')	goto yy1228;
+=======
 			if(yych == 'I')	goto yy1253;
+>>>>>>> 1.55
 			if(yych <= 'N')	goto yy133;
+<<<<<<< parse_date.c
+			goto yy1229;
+=======
 			goto yy1254;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'h'){
 			if(yych <= 'Z')	goto yy133;
 			if(yych <= '`')	goto yy3;
+<<<<<<< parse_date.c
+			if(yych <= 'a')	goto yy1241;
+=======
 			if(yych <= 'a')	goto yy1266;
+>>>>>>> 1.55
 			goto yy136;
 		} else {
 			if(yych <= 'n'){
+<<<<<<< parse_date.c
+				if(yych <= 'i')	goto yy1242;
+=======
 				if(yych <= 'i')	goto yy1267;
+>>>>>>> 1.55
 				goto yy136;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'o')	goto yy1243;
+=======
 				if(yych <= 'o')	goto yy1268;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy136;
 				goto yy3;
 			}
@@ -1019,24 +1115,48 @@ yy8:
 		if(yych <= 'A'){
 			if(yych == ')')	goto yy132;
 			if(yych <= '@')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1227;
+=======
 			goto yy1252;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'I')	goto yy1228;
+=======
 			if(yych == 'I')	goto yy1253;
+>>>>>>> 1.55
 			if(yych <= 'N')	goto yy133;
+<<<<<<< parse_date.c
+			goto yy1229;
+=======
 			goto yy1254;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'h'){
 			if(yych <= 'Z')	goto yy133;
 			if(yych <= '`')	goto yy3;
+<<<<<<< parse_date.c
+			if(yych <= 'a')	goto yy1227;
+=======
 			if(yych <= 'a')	goto yy1252;
+>>>>>>> 1.55
 			goto yy133;
 		} else {
 			if(yych <= 'n'){
+<<<<<<< parse_date.c
+				if(yych <= 'i')	goto yy1228;
+=======
 				if(yych <= 'i')	goto yy1253;
+>>>>>>> 1.55
 				goto yy133;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'o')	goto yy1229;
+=======
 				if(yych <= 'o')	goto yy1254;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy133;
 				goto yy3;
 			}
@@ -1051,18 +1171,38 @@ yy9:
 				if(yych == ')')	goto yy132;
 				goto yy3;
 			} else {
+<<<<<<< parse_date.c
+				if(yych == 'E')	goto yy1163;
+=======
 				if(yych == 'E')	goto yy1188;
+>>>>>>> 1.55
 				goto yy133;
 			}
 		} else {
 			if(yych <= 'O'){
+<<<<<<< parse_date.c
+				if(yych <= 'H')	goto yy1164;
+=======
 				if(yych <= 'H')	goto yy1189;
+>>>>>>> 1.55
 				if(yych <= 'N')	goto yy133;
+<<<<<<< parse_date.c
+				goto yy1165;
+=======
 				goto yy1190;
+>>>>>>> 1.55
 			} else {
+<<<<<<< parse_date.c
+				if(yych == 'U')	goto yy1166;
+=======
 				if(yych == 'U')	goto yy1191;
+>>>>>>> 1.55
 				if(yych <= 'V')	goto yy133;
+<<<<<<< parse_date.c
+				goto yy1167;
+=======
 				goto yy1192;
+>>>>>>> 1.55
 			}
 		}
 	} else {
@@ -1072,17 +1212,34 @@ yy9:
 				if(yych <= '`')	goto yy3;
 				goto yy136;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'e')	goto yy1196;
+				if(yych == 'h')	goto yy1197;
+=======
 				if(yych <= 'e')	goto yy1221;
 				if(yych == 'h')	goto yy1222;
+>>>>>>> 1.55
 				goto yy136;
 			}
 		} else {
 			if(yych <= 'u'){
+<<<<<<< parse_date.c
+				if(yych <= 'o')	goto yy1198;
+=======
 				if(yych <= 'o')	goto yy1223;
+>>>>>>> 1.55
 				if(yych <= 't')	goto yy136;
+<<<<<<< parse_date.c
+				goto yy1199;
+=======
 				goto yy1224;
+>>>>>>> 1.55
 			} else {
+<<<<<<< parse_date.c
+				if(yych == 'w')	goto yy1200;
+=======
 				if(yych == 'w')	goto yy1225;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy136;
 				goto yy3;
 			}
@@ -1097,18 +1254,38 @@ yy10:
 				if(yych == ')')	goto yy132;
 				goto yy3;
 			} else {
+<<<<<<< parse_date.c
+				if(yych == 'E')	goto yy1163;
+=======
 				if(yych == 'E')	goto yy1188;
+>>>>>>> 1.55
 				goto yy133;
 			}
 		} else {
 			if(yych <= 'O'){
+<<<<<<< parse_date.c
+				if(yych <= 'H')	goto yy1164;
+=======
 				if(yych <= 'H')	goto yy1189;
+>>>>>>> 1.55
 				if(yych <= 'N')	goto yy133;
+<<<<<<< parse_date.c
+				goto yy1165;
+=======
 				goto yy1190;
+>>>>>>> 1.55
 			} else {
+<<<<<<< parse_date.c
+				if(yych == 'U')	goto yy1166;
+=======
 				if(yych == 'U')	goto yy1191;
+>>>>>>> 1.55
 				if(yych <= 'V')	goto yy133;
+<<<<<<< parse_date.c
+				goto yy1167;
+=======
 				goto yy1192;
+>>>>>>> 1.55
 			}
 		}
 	} else {
@@ -1118,17 +1295,34 @@ yy10:
 				if(yych <= '`')	goto yy3;
 				goto yy133;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'e')	goto yy1163;
+				if(yych == 'h')	goto yy1164;
+=======
 				if(yych <= 'e')	goto yy1188;
 				if(yych == 'h')	goto yy1189;
+>>>>>>> 1.55
 				goto yy133;
 			}
 		} else {
 			if(yych <= 'u'){
+<<<<<<< parse_date.c
+				if(yych <= 'o')	goto yy1165;
+=======
 				if(yych <= 'o')	goto yy1190;
+>>>>>>> 1.55
 				if(yych <= 't')	goto yy133;
+<<<<<<< parse_date.c
+				goto yy1166;
+=======
 				goto yy1191;
+>>>>>>> 1.55
 			} else {
+<<<<<<< parse_date.c
+				if(yych == 'w')	goto yy1167;
+=======
 				if(yych == 'w')	goto yy1192;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy133;
 				goto yy3;
 			}
@@ -1138,9 +1332,17 @@ yy11:
 	YYDEBUG(11, *YYCURSOR);
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == '-')	goto yy1159;
+=======
 	if(yych == '-')	goto yy1184;
+>>>>>>> 1.55
 	if(yych <= '0')	goto yy12;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy1160;
+=======
 	if(yych <= '9')	goto yy1185;
+>>>>>>> 1.55
 	goto yy12;
 yy12:
 	YYDEBUG(12, *YYCURSOR);
@@ -1158,7 +1360,8 @@ yy13:
 	yych = *(YYMARKER = ++YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':
+	case 0x09:	goto yy56;
+	case ' ':	goto yy1122;
 	case '!':
 	case '"':
 	case '#':
@@ -1170,6 +1373,13 @@ yy13:
 	case ')':
 	case '*':
 	case '+':
+<<<<<<< parse_date.c
+	case ',':	goto yy618;
+	case '-':	goto yy617;
+	case '.':	goto yy1125;
+	case '/':	goto yy616;
+	case '0':	goto yy1158;
+=======
 	case ',':	case 'A':	case 'D':	case 'F':	case 'H':
 	case 'I':
 	case 'J':	case 'M':
@@ -1183,6 +1393,7 @@ yy13:
 	case '.':	goto yy1150;
 	case '/':	goto yy614;
 	case '0':	goto yy1183;
+>>>>>>> 1.55
 	case '1':
 	case '2':
 	case '3':
@@ -1191,12 +1402,36 @@ yy13:
 	case '6':
 	case '7':
 	case '8':
+<<<<<<< parse_date.c
+	case '9':	goto yy1157;
+	case ':':	goto yy1126;
+	case 'A':	case 'a':	goto yy701;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
+	case 'H':	case 'h':	goto yy60;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'S':	goto yy607;
+	case 'T':	goto yy65;
+	case 'V':	goto yy623;
+	case 'W':	case 'w':	goto yy62;
+	case 'X':	goto yy624;
+	case 'Y':	case 'y':	goto yy64;
+	case 'n':	goto yy614;
+	case 'r':	goto yy615;
+	case 's':	goto yy608;
+	case 't':	goto yy612;
+=======
 	case '9':	goto yy1182;
 	case ':':	goto yy1151;
 	case 'n':	goto yy612;
 	case 'r':	goto yy613;
 	case 's':	goto yy606;
 	case 't':	goto yy610;
+>>>>>>> 1.55
 	default:	goto yy12;
 	}
 yy14:
@@ -1205,7 +1440,8 @@ yy14:
 	yych = *(YYMARKER = ++YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':
+	case 0x09:	goto yy603;
+	case ' ':	goto yy605;
 	case '!':
 	case '"':
 	case '#':
@@ -1217,35 +1453,54 @@ yy14:
 	case ')':
 	case '*':
 	case '+':
-	case ',':	case 'A':	case 'D':	case 'F':	case 'H':
-	case 'I':
-	case 'J':	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':	case 'S':
-	case 'T':	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':	case 'a':	case 'd':	case 'f':	case 'h':	case 'j':	case 'm':	case 'o':
-	case 'p':	case 'w':	case 'y':	goto yy604;
-	case '-':	goto yy615;
-	case '.':	goto yy618;
-	case '/':	goto yy614;
+	case ',':	goto yy618;
+	case '-':	goto yy617;
+	case '.':	goto yy620;
+	case '/':	goto yy616;
 	case '0':
 	case '1':
+<<<<<<< parse_date.c
+	case '2':	goto yy1157;
+=======
 	case '2':	goto yy1182;
+>>>>>>> 1.55
 	case '3':
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
+<<<<<<< parse_date.c
+	case '9':	goto yy1124;
+	case ':':	goto yy629;
+	case 'A':	case 'a':	goto yy626;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
+	case 'H':	case 'h':	goto yy60;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'P':	case 'p':	goto yy630;
+	case 'S':	goto yy607;
+	case 'T':	goto yy65;
+	case 'V':	goto yy623;
+	case 'W':	case 'w':	goto yy62;
+	case 'X':	goto yy624;
+	case 'Y':	case 'y':	goto yy64;
+	case 'n':	goto yy614;
+	case 'r':	goto yy615;
+	case 's':	goto yy608;
+	case 't':	goto yy612;
+=======
 	case '9':	goto yy1149;
 	case ':':	goto yy627;
 	case 'n':	goto yy612;
 	case 'r':	goto yy613;
 	case 's':	goto yy606;
 	case 't':	goto yy610;
+>>>>>>> 1.55
 	default:	goto yy12;
 	}
 yy15:
@@ -1254,7 +1509,8 @@ yy15:
 	yych = *(YYMARKER = ++YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':
+	case 0x09:	goto yy603;
+	case ' ':	goto yy605;
 	case '!':
 	case '"':
 	case '#':
@@ -1266,35 +1522,54 @@ yy15:
 	case ')':
 	case '*':
 	case '+':
-	case ',':	case 'A':	case 'D':	case 'F':	case 'H':
-	case 'I':
-	case 'J':	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':	case 'S':
-	case 'T':	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':	case 'a':	case 'd':	case 'f':	case 'h':	case 'j':	case 'm':	case 'o':
-	case 'p':	case 'w':	case 'y':	goto yy604;
-	case '-':	goto yy615;
-	case '.':	goto yy618;
-	case '/':	goto yy614;
+	case ',':	goto yy618;
+	case '-':	goto yy617;
+	case '.':	goto yy620;
+	case '/':	goto yy616;
 	case '0':
 	case '1':
 	case '2':
+<<<<<<< parse_date.c
+	case '3':	goto yy1124;
+=======
 	case '3':	goto yy1149;
+>>>>>>> 1.55
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
+<<<<<<< parse_date.c
+	case '9':	goto yy1121;
+	case ':':	goto yy629;
+	case 'A':	case 'a':	goto yy626;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
+	case 'H':	case 'h':	goto yy60;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'P':	case 'p':	goto yy630;
+	case 'S':	goto yy607;
+	case 'T':	goto yy65;
+	case 'V':	goto yy623;
+	case 'W':	case 'w':	goto yy62;
+	case 'X':	goto yy624;
+	case 'Y':	case 'y':	goto yy64;
+	case 'n':	goto yy614;
+	case 'r':	goto yy615;
+	case 's':	goto yy608;
+	case 't':	goto yy612;
+=======
 	case '9':	goto yy1146;
 	case ':':	goto yy627;
 	case 'n':	goto yy612;
 	case 'r':	goto yy613;
 	case 's':	goto yy606;
 	case 't':	goto yy610;
+>>>>>>> 1.55
 	default:	goto yy12;
 	}
 yy16:
@@ -1303,7 +1578,8 @@ yy16:
 	yych = *(YYMARKER = ++YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':
+	case 0x09:	goto yy603;
+	case ' ':	goto yy605;
 	case '!':
 	case '"':
 	case '#':
@@ -1315,22 +1591,16 @@ yy16:
 	case ')':
 	case '*':
 	case '+':
-	case ',':	case 'A':	case 'D':	case 'F':	case 'H':
-	case 'I':
-	case 'J':	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':	case 'S':
-	case 'T':	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':	case 'a':	case 'd':	case 'f':	case 'h':	case 'j':	case 'm':	case 'o':
-	case 'p':	case 'w':	case 'y':	goto yy604;
-	case '-':	goto yy615;
-	case '.':	goto yy618;
-	case '/':	goto yy614;
+	case ',':	goto yy618;
+	case '-':	goto yy617;
+	case '.':	goto yy620;
+	case '/':	goto yy616;
 	case '0':
+<<<<<<< parse_date.c
+	case '1':	goto yy1121;
+=======
 	case '1':	goto yy1146;
+>>>>>>> 1.55
 	case '2':
 	case '3':
 	case '4':
@@ -1338,12 +1608,28 @@ yy16:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy611;
-	case ':':	goto yy627;
-	case 'n':	goto yy612;
-	case 'r':	goto yy613;
-	case 's':	goto yy606;
-	case 't':	goto yy610;
+	case '9':	goto yy613;
+	case ':':	goto yy629;
+	case 'A':	case 'a':	goto yy626;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
+	case 'H':	case 'h':	goto yy60;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'P':	case 'p':	goto yy630;
+	case 'S':	goto yy607;
+	case 'T':	goto yy65;
+	case 'V':	goto yy623;
+	case 'W':	case 'w':	goto yy62;
+	case 'X':	goto yy624;
+	case 'Y':	case 'y':	goto yy64;
+	case 'n':	goto yy614;
+	case 'r':	goto yy615;
+	case 's':	goto yy608;
+	case 't':	goto yy612;
 	default:	goto yy12;
 	}
 yy17:
@@ -1352,7 +1638,8 @@ yy17:
 	yych = *(YYMARKER = ++YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':
+	case 0x09:	goto yy603;
+	case ' ':	goto yy605;
 	case '!':
 	case '"':
 	case '#':
@@ -1364,20 +1651,10 @@ yy17:
 	case ')':
 	case '*':
 	case '+':
-	case ',':	case 'A':	case 'D':	case 'F':	case 'H':
-	case 'I':
-	case 'J':	case 'M':
-	case 'N':
-	case 'O':
-	case 'P':	case 'S':
-	case 'T':	case 'V':
-	case 'W':
-	case 'X':
-	case 'Y':	case 'a':	case 'd':	case 'f':	case 'h':	case 'j':	case 'm':	case 'o':
-	case 'p':	case 'w':	case 'y':	goto yy604;
-	case '-':	goto yy615;
-	case '.':	goto yy618;
-	case '/':	goto yy614;
+	case ',':	goto yy618;
+	case '-':	goto yy617;
+	case '.':	goto yy620;
+	case '/':	goto yy616;
 	case '0':
 	case '1':
 	case '2':
@@ -1387,12 +1664,28 @@ yy17:
 	case '6':
 	case '7':
 	case '8':
-	case '9':	goto yy611;
-	case ':':	goto yy627;
-	case 'n':	goto yy612;
-	case 'r':	goto yy613;
-	case 's':	goto yy606;
-	case 't':	goto yy610;
+	case '9':	goto yy613;
+	case ':':	goto yy629;
+	case 'A':	case 'a':	goto yy626;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
+	case 'H':	case 'h':	goto yy60;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'P':	case 'p':	goto yy630;
+	case 'S':	goto yy607;
+	case 'T':	goto yy65;
+	case 'V':	goto yy623;
+	case 'W':	case 'w':	goto yy62;
+	case 'X':	goto yy624;
+	case 'Y':	case 'y':	goto yy64;
+	case 'n':	goto yy614;
+	case 'r':	goto yy615;
+	case 's':	goto yy608;
+	case 't':	goto yy612;
 	default:	goto yy12;
 	}
 yy18:
@@ -2046,7 +2339,7 @@ yy41:
 	YYDEBUG(41, *YYCURSOR);
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yybm[0+yych] & 16) {
+	if(yybm[0+yych] & 8) {
 		goto yy54;
 	}
 	if(yych <= '/')	goto yy12;
@@ -2090,7 +2383,7 @@ yy45:
 	YYDEBUG(45, *YYCURSOR);
 	yyaccept = 2;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yybm[0+yych] & 16) {
+	if(yybm[0+yych] & 8) {
 		goto yy54;
 	}
 	if(yych <= '/')	goto yy46;
@@ -2103,7 +2396,7 @@ yy46:
 {
 		goto std;
 	}
-#line 2009 "ext/date/lib/parse_date.c"
+#line 2045 "ext/date/lib/parse_date.c"
 yy47:
 	YYDEBUG(47, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -2120,7 +2413,7 @@ yy49:
 		s->pos = cursor; s->line++;
 		goto std;
 	}
-#line 2020 "ext/date/lib/parse_date.c"
+#line 2056 "ext/date/lib/parse_date.c"
 yy50:
 	YYDEBUG(50, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -2133,12 +2426,21 @@ yy51:
 	goto yy52;
 yy52:
 	YYDEBUG(52, *YYCURSOR);
-	if(yybm[0+yych] & 8) {
-		goto yy51;
+	if(yybm[0+yych] & 16) {
+		goto yy56;
 	}
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':	goto yy56;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy51;
 	case 'D':	case 'd':	goto yy61;
 	case 'F':	case 'f':	goto yy63;
 	case 'H':	case 'h':	goto yy60;
@@ -2153,6 +2455,19 @@ yy53:
 	YYDEBUG(53, *YYCURSOR);
 	YYCURSOR = YYMARKER;
 	switch(yyaccept){
+<<<<<<< parse_date.c
+	case 26:	goto yy1293;
+	case 24:	goto yy1262;
+	case 25:	goto yy1270;
+	case 23:	goto yy1186;
+	case 22:	goto yy1183;
+	case 11:	goto yy636;
+	case 20:	goto yy1129;
+	case 21:	goto yy1137;
+	case 13:	goto yy786;
+	case 18:	goto yy1026;
+	case 12:	goto yy777;
+=======
 	case 26:	goto yy1318;
 	case 24:	goto yy1287;
 	case 25:	goto yy1295;
@@ -2164,14 +2479,27 @@ yy53:
 	case 13:	goto yy787;
 	case 18:	goto yy1051;
 	case 12:	goto yy777;
+>>>>>>> 1.55
 	case 8:	goto yy420;
+<<<<<<< parse_date.c
+	case 17:	goto yy891;
+=======
 	case 17:	goto yy897;
+>>>>>>> 1.55
 	case 6:	goto yy363;
+<<<<<<< parse_date.c
+	case 10:	goto yy622;
+	case 16:	goto yy924;
+	case 19:	goto yy935;
+	case 15:	goto yy917;
+	case 14:	goto yy882;
+=======
 	case 10:	goto yy620;
 	case 16:	goto yy951;
 	case 19:	goto yy945;
 	case 15:	goto yy924;
 	case 14:	goto yy888;
+>>>>>>> 1.55
 	case 9:	goto yy526;
 	case 5:	goto yy341;
 	case 4:	goto yy172;
@@ -2189,7 +2517,7 @@ yy54:
 	goto yy55;
 yy55:
 	YYDEBUG(55, *YYCURSOR);
-	if(yybm[0+yych] & 16) {
+	if(yybm[0+yych] & 8) {
 		goto yy54;
 	}
 	if(yych <= '/')	goto yy53;
@@ -2203,9 +2531,11 @@ yy56:
 	goto yy57;
 yy57:
 	YYDEBUG(57, *YYCURSOR);
+	if(yybm[0+yych] & 16) {
+		goto yy56;
+	}
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':	goto yy56;
 	case 'D':	case 'd':	goto yy61;
 	case 'F':	case 'f':	goto yy63;
 	case 'H':	case 'h':	goto yy60;
@@ -2347,7 +2677,7 @@ yy69:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 2205 "ext/date/lib/parse_date.c"
+#line 2252 "ext/date/lib/parse_date.c"
 yy70:
 	YYDEBUG(70, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -2935,67 +3265,216 @@ yy146:
 	YYDEBUG(146, *YYCURSOR);
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	YYDEBUG(-1, yych);
-	switch(yych){
-	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
-	case 'T':	case 'W':	case 'Y':	case 'd':	case 'f':	case 'h':	case 'm':	case 's':
-	case 't':	case 'w':	case 'y':	goto yy57;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy148;
-	case ':':	goto yy149;
-	default:	goto yy3;
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy3;
+				goto yy57;
+			} else {
+				if(yych <= '9'){
+					if(yych <= '/')	goto yy3;
+					goto yy148;
+				} else {
+					if(yych <= ':')	goto yy149;
+					if(yych <= 'C')	goto yy3;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy57;
+				if(yych <= 'G')	goto yy3;
+				goto yy57;
+			} else {
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych <= 'R')	goto yy3;
+					if(yych <= 'T')	goto yy57;
+					goto yy3;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy3;
+				if(yych <= 'Y')	goto yy57;
+				goto yy3;
+			} else {
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy57;
+					goto yy3;
+				} else {
+					if(yych == 'g')	goto yy3;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych <= 'r')	goto yy3;
+				goto yy57;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy3;
+				}
+			}
+		}
 	}
 yy147:
 	YYDEBUG(147, *YYCURSOR);
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	YYDEBUG(-1, yych);
-	switch(yych){
-	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
-	case 'T':	case 'W':	case 'Y':	case 'd':	case 'f':	case 'h':	case 'm':	case 's':
-	case 't':	case 'w':	case 'y':	goto yy57;
-	case '0':
-	case '1':
-	case '2':
-	case '3':	goto yy148;
-	case '4':
-	case '5':	goto yy150;
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy151;
-	case ':':	goto yy149;
-	default:	goto yy3;
+	if(yych <= 'T'){
+		if(yych <= ':'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy3;
+				goto yy57;
+			} else {
+				if(yych <= '3'){
+					if(yych <= '/')	goto yy3;
+					goto yy148;
+				} else {
+					if(yych <= '5')	goto yy150;
+					if(yych <= '9')	goto yy151;
+					goto yy149;
+				}
+			}
+		} else {
+			if(yych <= 'G'){
+				if(yych <= 'D'){
+					if(yych <= 'C')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych == 'F')	goto yy57;
+					goto yy3;
+				}
+			} else {
+				if(yych <= 'L'){
+					if(yych <= 'H')	goto yy57;
+					goto yy3;
+				} else {
+					if(yych <= 'M')	goto yy57;
+					if(yych <= 'R')	goto yy3;
+					goto yy57;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'g'){
+			if(yych <= 'Y'){
+				if(yych == 'W')	goto yy57;
+				if(yych <= 'X')	goto yy3;
+				goto yy57;
+			} else {
+				if(yych <= 'd'){
+					if(yych <= 'c')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych == 'f')	goto yy57;
+					goto yy3;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych <= 'l'){
+					if(yych <= 'h')	goto yy57;
+					goto yy3;
+				} else {
+					if(yych <= 'm')	goto yy57;
+					if(yych <= 'r')	goto yy3;
+					goto yy57;
+				}
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy3;
+				}
+			}
+		}
 	}
 yy148:
 	YYDEBUG(148, *YYCURSOR);
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	YYDEBUG(-1, yych);
-	switch(yych){
-	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
-	case 'T':	case 'W':	case 'Y':	case 'd':	case 'f':	case 'h':	case 'm':	case 's':
-	case 't':	case 'w':	case 'y':	goto yy57;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':	goto yy150;
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy151;
-	case ':':	goto yy149;
-	default:	goto yy3;
+	if(yych <= 'T'){
+		if(yych <= 'C'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy3;
+				goto yy57;
+			} else {
+				if(yych <= '5'){
+					if(yych <= '/')	goto yy3;
+					goto yy150;
+				} else {
+					if(yych <= '9')	goto yy151;
+					if(yych >= ';')	goto yy3;
+					goto yy149;
+				}
+			}
+		} else {
+			if(yych <= 'G'){
+				if(yych == 'E')	goto yy3;
+				if(yych <= 'F')	goto yy57;
+				goto yy3;
+			} else {
+				if(yych <= 'L'){
+					if(yych <= 'H')	goto yy57;
+					goto yy3;
+				} else {
+					if(yych <= 'M')	goto yy57;
+					if(yych <= 'R')	goto yy3;
+					goto yy57;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'g'){
+			if(yych <= 'Y'){
+				if(yych == 'W')	goto yy57;
+				if(yych <= 'X')	goto yy3;
+				goto yy57;
+			} else {
+				if(yych <= 'd'){
+					if(yych <= 'c')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych == 'f')	goto yy57;
+					goto yy3;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych <= 'l'){
+					if(yych <= 'h')	goto yy57;
+					goto yy3;
+				} else {
+					if(yych <= 'm')	goto yy57;
+					if(yych <= 'r')	goto yy3;
+					goto yy57;
+				}
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy3;
+				}
+			}
+		}
 	}
 yy149:
 	YYDEBUG(149, *YYCURSOR);
@@ -3008,72 +3487,119 @@ yy150:
 	YYDEBUG(150, *YYCURSOR);
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	YYDEBUG(-1, yych);
-	switch(yych){
-	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
-	case 'T':	case 'W':	case 'Y':	case 'd':	case 'f':	case 'h':	case 'm':	case 's':
-	case 't':	case 'w':	case 'y':	goto yy57;
-	case '0':
-	case '1':
-	case '2':
-	case '3':
-	case '4':
-	case '5':
-	case '6':
-	case '7':
-	case '8':
-	case '9':	goto yy151;
-	default:	goto yy3;
-	}
-yy151:
-	YYDEBUG(151, *YYCURSOR);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if(yybm[0+yych] & 8) {
-		goto yy51;
-	}
-	if(yych <= 'X'){
-		if(yych <= 'G'){
-			if(yych <= 'C'){
-				if(yych == ' ')	goto yy57;
-				goto yy3;
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy3;
+				goto yy57;
 			} else {
-				if(yych == 'E')	goto yy3;
-				if(yych <= 'F')	goto yy57;
-				goto yy3;
+				if(yych <= '/')	goto yy3;
+				if(yych <= '9')	goto yy151;
+				if(yych <= 'C')	goto yy3;
+				goto yy57;
 			}
 		} else {
-			if(yych <= 'R'){
-				if(yych <= 'H')	goto yy57;
-				if(yych == 'M')	goto yy57;
-				goto yy3;
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy57;
+				if(yych <= 'G')	goto yy3;
+				goto yy57;
 			} else {
-				if(yych <= 'T')	goto yy57;
-				if(yych == 'W')	goto yy57;
-				goto yy3;
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych <= 'R')	goto yy3;
+					if(yych <= 'T')	goto yy57;
+					goto yy3;
+				}
 			}
 		}
 	} else {
-		if(yych <= 'l'){
-			if(yych <= 'e'){
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy3;
 				if(yych <= 'Y')	goto yy57;
-				if(yych == 'd')	goto yy57;
 				goto yy3;
 			} else {
-				if(yych == 'g')	goto yy3;
-				if(yych <= 'h')	goto yy57;
-				goto yy3;
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy57;
+					goto yy3;
+				} else {
+					if(yych == 'g')	goto yy3;
+					goto yy57;
+				}
 			}
 		} else {
-			if(yych <= 'v'){
-				if(yych <= 'm')	goto yy57;
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
 				if(yych <= 'r')	goto yy3;
-				if(yych <= 't')	goto yy57;
-				goto yy3;
+				goto yy57;
 			} else {
-				if(yych == 'x')	goto yy3;
-				if(yych <= 'y')	goto yy57;
-				goto yy3;
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy3;
+				}
+			}
+		}
+	}
+yy151:
+	YYDEBUG(151, *YYCURSOR);
+	yyaccept = 1;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yybm[0+yych] & 4) {
+		goto yy51;
+	}
+	if(yych <= 'W'){
+		if(yych <= 'F'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy3;
+				goto yy57;
+			} else {
+				if(yych == 'D')	goto yy57;
+				if(yych <= 'E')	goto yy3;
+				goto yy57;
+			}
+		} else {
+			if(yych <= 'M'){
+				if(yych == 'H')	goto yy57;
+				if(yych <= 'L')	goto yy3;
+				goto yy57;
+			} else {
+				if(yych <= 'R')	goto yy3;
+				if(yych <= 'T')	goto yy57;
+				if(yych <= 'V')	goto yy3;
+				goto yy57;
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'd'){
+				if(yych == 'Y')	goto yy57;
+				if(yych <= 'c')	goto yy3;
+				goto yy57;
+			} else {
+				if(yych == 'f')	goto yy57;
+				if(yych <= 'g')	goto yy3;
+				goto yy57;
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych <= 'r')	goto yy3;
+				goto yy57;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy3;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy3;
+				}
 			}
 		}
 	}
@@ -3167,18 +3693,64 @@ yy159:
 	goto yy160;
 yy160:
 	YYDEBUG(160, *YYCURSOR);
-	YYDEBUG(-1, yych);
-	switch(yych){
-	case ' ':	goto yy159;
-	case 'D':	case 'd':	goto yy164;
-	case 'F':	case 'f':	goto yy166;
-	case 'H':	case 'h':	goto yy163;
-	case 'M':	case 'm':	goto yy162;
-	case 'S':	case 's':	goto yy161;
-	case 'T':	case 't':	goto yy168;
-	case 'W':	case 'w':	goto yy165;
-	case 'Y':	case 'y':	goto yy167;
-	default:	goto yy53;
+	if(yych <= 'W'){
+		if(yych <= 'F'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy159;
+				if(yych <= 0x1F)	goto yy53;
+				goto yy159;
+			} else {
+				if(yych == 'D')	goto yy164;
+				if(yych <= 'E')	goto yy53;
+				goto yy166;
+			}
+		} else {
+			if(yych <= 'M'){
+				if(yych == 'H')	goto yy163;
+				if(yych <= 'L')	goto yy53;
+				goto yy162;
+			} else {
+				if(yych <= 'S'){
+					if(yych <= 'R')	goto yy53;
+					goto yy161;
+				} else {
+					if(yych <= 'T')	goto yy168;
+					if(yych <= 'V')	goto yy53;
+					goto yy165;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'l'){
+			if(yych <= 'd'){
+				if(yych == 'Y')	goto yy167;
+				if(yych <= 'c')	goto yy53;
+				goto yy164;
+			} else {
+				if(yych <= 'f'){
+					if(yych <= 'e')	goto yy53;
+					goto yy166;
+				} else {
+					if(yych == 'h')	goto yy163;
+					goto yy53;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych <= 'm')	goto yy162;
+				if(yych <= 'r')	goto yy53;
+				if(yych >= 't')	goto yy168;
+				goto yy161;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy53;
+					goto yy165;
+				} else {
+					if(yych == 'y')	goto yy167;
+					goto yy53;
+				}
+			}
+		}
 	}
 yy161:
 	YYDEBUG(161, *YYCURSOR);
@@ -3312,7 +3884,7 @@ yy172:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
-#line 2959 "ext/date/lib/parse_date.c"
+#line 3253 "ext/date/lib/parse_date.c"
 yy173:
 	YYDEBUG(173, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -4622,13 +5194,63 @@ yy317:
 	YYDEBUG(317, *YYCURSOR);
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	YYDEBUG(-1, yych);
-	switch(yych){
-	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
-	case 'T':	case 'W':	case 'Y':	case 'd':	case 'f':	case 'h':	case 'm':	case 's':
-	case 't':	case 'w':	case 'y':	goto yy160;
-	case ')':	goto yy132;
-	default:	goto yy3;
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy160;
+				if(yych <= 0x1F)	goto yy3;
+				goto yy160;
+			} else {
+				if(yych == ')')	goto yy132;
+				if(yych <= 'C')	goto yy3;
+				goto yy160;
+			}
+		} else {
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy160;
+				if(yych <= 'G')	goto yy3;
+				goto yy160;
+			} else {
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy3;
+					goto yy160;
+				} else {
+					if(yych <= 'R')	goto yy3;
+					if(yych <= 'T')	goto yy160;
+					goto yy3;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy3;
+				if(yych <= 'Y')	goto yy160;
+				goto yy3;
+			} else {
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy160;
+					goto yy3;
+				} else {
+					if(yych == 'g')	goto yy3;
+					goto yy160;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy160;
+				if(yych <= 'r')	goto yy3;
+				goto yy160;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy3;
+					goto yy160;
+				} else {
+					if(yych == 'y')	goto yy160;
+					goto yy3;
+				}
+			}
+		}
 	}
 yy318:
 	YYDEBUG(318, *YYCURSOR);
@@ -4686,7 +5308,7 @@ yy320:
 	yych = *(YYMARKER = ++YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
+	case 0x09:	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
 	case 'T':	case 'W':	case 'Y':	goto yy160;
 	case ')':	goto yy132;
 	case '/':	case '_':	goto yy138;
@@ -5089,7 +5711,7 @@ yy341:
 		TIMELIB_DEINIT;
 		return TIMELIB_WEEKDAY;
 	}
-#line 4396 "ext/date/lib/parse_date.c"
+#line 4741 "ext/date/lib/parse_date.c"
 yy342:
 	YYDEBUG(342, *YYCURSOR);
 	yyaccept = 1;
@@ -5363,7 +5985,7 @@ yy363:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 4626 "ext/date/lib/parse_date.c"
+#line 4971 "ext/date/lib/parse_date.c"
 yy364:
 	YYDEBUG(364, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -5601,7 +6223,7 @@ yy385:
 		TIMELIB_DEINIT;
 		return TIMELIB_SHORTDATE_WITH_TIME;
 	}
-#line 4820 "ext/date/lib/parse_date.c"
+#line 5165 "ext/date/lib/parse_date.c"
 yy386:
 	YYDEBUG(386, *YYCURSOR);
 	yyaccept = 7;
@@ -5636,18 +6258,19 @@ yy391:
 	YYDEBUG(391, *YYCURSOR);
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '+'){
-		if(yych <= '\''){
-			if(yych != ' ')	goto yy385;
+	if(yych <= '*'){
+		if(yych <= 0x1F){
+			if(yych != 0x09)	goto yy385;
 			goto yy392;
 		} else {
-			if(yych <= '(')	goto yy395;
-			if(yych <= '*')	goto yy385;
-			goto yy394;
+			if(yych <= ' ')	goto yy392;
+			if(yych == '(')	goto yy395;
+			goto yy385;
 		}
 	} else {
 		if(yych <= '@'){
-			if(yych == '-')	goto yy394;
+			if(yych == ',')	goto yy385;
+			if(yych <= '-')	goto yy394;
 			goto yy385;
 		} else {
 			if(yych <= 'Z')	goto yy396;
@@ -5664,18 +6287,19 @@ yy392:
 	goto yy393;
 yy393:
 	YYDEBUG(393, *YYCURSOR);
-	if(yych <= '+'){
-		if(yych <= '\''){
-			if(yych == ' ')	goto yy392;
+	if(yych <= '*'){
+		if(yych <= 0x1F){
+			if(yych == 0x09)	goto yy392;
 			goto yy53;
 		} else {
-			if(yych <= '(')	goto yy395;
-			if(yych <= '*')	goto yy53;
-			goto yy394;
+			if(yych <= ' ')	goto yy392;
+			if(yych == '(')	goto yy395;
+			goto yy53;
 		}
 	} else {
 		if(yych <= '@'){
-			if(yych != '-')	goto yy53;
+			if(yych == ',')	goto yy53;
+			if(yych >= '.')	goto yy53;
 			goto yy394;
 		} else {
 			if(yych <= 'Z')	goto yy396;
@@ -5957,7 +6581,7 @@ yy420:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
-#line 5106 "ext/date/lib/parse_date.c"
+#line 5453 "ext/date/lib/parse_date.c"
 yy421:
 	YYDEBUG(421, *YYCURSOR);
 	yyaccept = 6;
@@ -6147,26 +6771,35 @@ yy436:
 	YYDEBUG(436, *YYCURSOR);
 	yyaccept = 7;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '-'){
-		if(yych <= '('){
-			if(yych == ' ')	goto yy392;
-			if(yych <= '\'')	goto yy385;
-			goto yy395;
+	if(yych <= ','){
+		if(yych <= ' '){
+			if(yych == 0x09)	goto yy392;
+			if(yych <= 0x1F)	goto yy385;
+			goto yy392;
 		} else {
-			if(yych == '+')	goto yy394;
-			if(yych <= ',')	goto yy385;
-			goto yy394;
+			if(yych <= '('){
+				if(yych <= '\'')	goto yy385;
+				goto yy395;
+			} else {
+				if(yych == '+')	goto yy394;
+				goto yy385;
+			}
 		}
 	} else {
-		if(yych <= '@'){
+		if(yych <= ':'){
+			if(yych <= '-')	goto yy394;
 			if(yych <= '.')	goto yy387;
-			if(yych == ':')	goto yy387;
-			goto yy385;
+			if(yych <= '9')	goto yy385;
+			goto yy387;
 		} else {
-			if(yych <= 'Z')	goto yy396;
-			if(yych <= '`')	goto yy385;
-			if(yych <= 'z')	goto yy397;
-			goto yy385;
+			if(yych <= 'Z'){
+				if(yych <= '@')	goto yy385;
+				goto yy396;
+			} else {
+				if(yych <= '`')	goto yy385;
+				if(yych <= 'z')	goto yy397;
+				goto yy385;
+			}
 		}
 	}
 yy437:
@@ -6342,7 +6975,7 @@ yy446:
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
-#line 5439 "ext/date/lib/parse_date.c"
+#line 5795 "ext/date/lib/parse_date.c"
 yy447:
 	YYDEBUG(447, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -7757,7 +8390,7 @@ yy526:
 		TIMELIB_DEINIT;
 		return TIMELIB_AGO;
 	}
-#line 6694 "ext/date/lib/parse_date.c"
+#line 7050 "ext/date/lib/parse_date.c"
 yy527:
 	YYDEBUG(527, *YYCURSOR);
 	yyaccept = 1;
@@ -9416,14 +10049,37 @@ yy602:
 yy603:
 	YYDEBUG(603, *YYCURSOR);
 	++YYCURSOR;
-	if((YYLIMIT - YYCURSOR) < 13) YYFILL(13);
+	if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
 	yych = *YYCURSOR;
 	goto yy604;
 yy604:
 	YYDEBUG(604, *YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':	goto yy603;
+	case 0x09:	case ' ':	goto yy603;
+	case 'A':	case 'P':	case 'a':	case 'p':	goto yy630;
+	case 'D':	case 'd':	goto yy61;
+	case 'F':	case 'f':	goto yy63;
+	case 'H':	case 'h':	goto yy60;
+	case 'M':	case 'm':	goto yy59;
+	case 'S':	case 's':	goto yy58;
+	case 'T':	case 't':	goto yy65;
+	case 'W':	case 'w':	goto yy62;
+	case 'Y':	case 'y':	goto yy64;
+	default:	goto yy53;
+	}
+yy605:
+	YYDEBUG(605, *YYCURSOR);
+	++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 13) YYFILL(13);
+	yych = *YYCURSOR;
+	goto yy606;
+yy606:
+	YYDEBUG(606, *YYCURSOR);
+	YYDEBUG(-1, yych);
+	switch(yych){
+	case 0x09:	goto yy603;
+	case ' ':	goto yy605;
 	case '!':
 	case '"':
 	case '#':
@@ -9437,34 +10093,38 @@ yy604:
 	case '+':
 	case ',':
 	case '-':
-	case '.':	goto yy616;
-	case 'A':	case 'a':	goto yy624;
-	case 'D':	case 'd':	goto yy608;
-	case 'F':	case 'f':	goto yy609;
+	case '.':	goto yy618;
+	case 'A':	case 'a':	goto yy626;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
 	case 'H':	case 'h':	goto yy60;
-	case 'I':	goto yy619;
-	case 'J':	case 'j':	goto yy623;
-	case 'M':	case 'm':	goto yy607;
-	case 'N':	case 'n':	goto yy626;
-	case 'O':	case 'o':	goto yy625;
-	case 'P':	case 'p':	goto yy628;
-	case 'S':	case 's':	goto yy605;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	case 'n':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'P':	case 'p':	goto yy630;
+	case 'S':	case 's':	goto yy607;
 	case 'T':	case 't':	goto yy65;
-	case 'V':	goto yy621;
+	case 'V':	goto yy623;
 	case 'W':	case 'w':	goto yy62;
-	case 'X':	goto yy622;
+	case 'X':	goto yy624;
 	case 'Y':	case 'y':	goto yy64;
 	default:	goto yy53;
 	}
-yy605:
-	YYDEBUG(605, *YYCURSOR);
+yy607:
+	YYDEBUG(607, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
 		if(yych <= 'D'){
 			if(yych == 'A')	goto yy119;
 			goto yy53;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'E')	goto yy1120;
+=======
 			if(yych <= 'E')	goto yy1145;
+>>>>>>> 1.55
 			if(yych <= 'T')	goto yy53;
 			goto yy118;
 		}
@@ -9473,20 +10133,28 @@ yy605:
 			if(yych == 'a')	goto yy119;
 			goto yy53;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'e')	goto yy1120;
+=======
 			if(yych <= 'e')	goto yy1145;
+>>>>>>> 1.55
 			if(yych == 'u')	goto yy118;
 			goto yy53;
 		}
 	}
-yy606:
-	YYDEBUG(606, *YYCURSOR);
+yy608:
+	YYDEBUG(608, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '`'){
 		if(yych <= 'D'){
 			if(yych == 'A')	goto yy119;
 			goto yy53;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'E')	goto yy1120;
+=======
 			if(yych <= 'E')	goto yy1145;
+>>>>>>> 1.55
 			if(yych == 'U')	goto yy118;
 			goto yy53;
 		}
@@ -9494,20 +10162,28 @@ yy606:
 		if(yych <= 'e'){
 			if(yych <= 'a')	goto yy119;
 			if(yych <= 'd')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy1120;
+=======
 			goto yy1145;
+>>>>>>> 1.55
 		} else {
 			if(yych <= 's')	goto yy53;
+<<<<<<< parse_date.c
+			if(yych <= 't')	goto yy845;
+=======
 			if(yych <= 't')	goto yy846;
+>>>>>>> 1.55
 			if(yych <= 'u')	goto yy118;
 			goto yy53;
 		}
 	}
-yy607:
-	YYDEBUG(607, *YYCURSOR);
+yy609:
+	YYDEBUG(609, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'O'){
 		if(yych <= 'H'){
-			if(yych == 'A')	goto yy715;
+			if(yych == 'A')	goto yy717;
 			goto yy53;
 		} else {
 			if(yych <= 'I')	goto yy110;
@@ -9516,7 +10192,7 @@ yy607:
 		}
 	} else {
 		if(yych <= 'h'){
-			if(yych == 'a')	goto yy715;
+			if(yych == 'a')	goto yy717;
 			goto yy53;
 		} else {
 			if(yych <= 'i')	goto yy110;
@@ -9524,28 +10200,28 @@ yy607:
 			goto yy53;
 		}
 	}
-yy608:
-	YYDEBUG(608, *YYCURSOR);
+yy610:
+	YYDEBUG(610, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'E'){
 		if(yych == 'A')	goto yy106;
 		if(yych <= 'D')	goto yy53;
-		goto yy702;
+		goto yy704;
 	} else {
 		if(yych <= 'a'){
 			if(yych <= '`')	goto yy53;
 			goto yy106;
 		} else {
-			if(yych == 'e')	goto yy702;
+			if(yych == 'e')	goto yy704;
 			goto yy53;
 		}
 	}
-yy609:
-	YYDEBUG(609, *YYCURSOR);
+yy611:
+	YYDEBUG(611, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'R'){
 		if(yych <= 'N'){
-			if(yych == 'E')	goto yy718;
+			if(yych == 'E')	goto yy720;
 			goto yy53;
 		} else {
 			if(yych <= 'O')	goto yy83;
@@ -9554,7 +10230,7 @@ yy609:
 		}
 	} else {
 		if(yych <= 'n'){
-			if(yych == 'e')	goto yy718;
+			if(yych == 'e')	goto yy720;
 			goto yy53;
 		} else {
 			if(yych <= 'o')	goto yy83;
@@ -9562,8 +10238,8 @@ yy609:
 			goto yy53;
 		}
 	}
-yy610:
-	YYDEBUG(610, *YYCURSOR);
+yy612:
+	YYDEBUG(612, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
 		if(yych == 'H')	goto yy66;
@@ -9572,49 +10248,86 @@ yy610:
 	} else {
 		if(yych <= 'h'){
 			if(yych <= 'g')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy1119;
+=======
 			goto yy1144;
+>>>>>>> 1.55
 		} else {
 			if(yych == 'u')	goto yy67;
 			goto yy53;
 		}
 	}
-yy611:
-	YYDEBUG(611, *YYCURSOR);
+yy613:
+	YYDEBUG(613, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == '-')	goto yy854;
+=======
 	if(yych == '-')	goto yy853;
+>>>>>>> 1.55
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy853;
+=======
 	if(yych <= '9')	goto yy852;
+>>>>>>> 1.55
 	goto yy57;
-yy612:
-	YYDEBUG(612, *YYCURSOR);
+yy614:
+	YYDEBUG(614, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'c'){
-		if(yych == 'O')	goto yy655;
+		if(yych == 'O')	goto yy657;
 		goto yy53;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'd')	goto yy845;
+		if(yych == 'o')	goto yy657;
+=======
 		if(yych <= 'd')	goto yy846;
 		if(yych == 'o')	goto yy655;
+>>>>>>> 1.55
 		goto yy53;
 	}
-yy613:
-	YYDEBUG(613, *YYCURSOR);
+yy615:
+	YYDEBUG(615, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'd')	goto yy845;
+=======
 	if(yych == 'd')	goto yy846;
+>>>>>>> 1.55
 	goto yy53;
-yy614:
-	YYDEBUG(614, *YYCURSOR);
+yy616:
+	YYDEBUG(616, *YYCURSOR);
 	yych = *++YYCURSOR;
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case '0':
 	case '1':
+<<<<<<< parse_date.c
+	case '2':	goto yy785;
+	case '3':	goto yy787;
+=======
 	case '2':	goto yy786;
 	case '3':	goto yy788;
+>>>>>>> 1.55
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
+<<<<<<< parse_date.c
+	case '9':	goto yy788;
+	case 'A':	case 'a':	goto yy792;
+	case 'D':	case 'd':	goto yy796;
+	case 'F':	case 'f':	goto yy790;
+	case 'J':	case 'j':	goto yy789;
+	case 'M':	case 'm':	goto yy791;
+	case 'N':	case 'n':	goto yy795;
+	case 'O':	case 'o':	goto yy794;
+	case 'S':	case 's':	goto yy793;
+=======
 	case '9':	goto yy789;
 	case 'A':	case 'a':	goto yy793;
 	case 'D':	case 'd':	goto yy797;
@@ -9624,10 +10337,11 @@ yy614:
 	case 'N':	case 'n':	goto yy796;
 	case 'O':	case 'o':	goto yy795;
 	case 'S':	case 's':	goto yy794;
+>>>>>>> 1.55
 	default:	goto yy53;
 	}
-yy615:
-	YYDEBUG(615, *YYCURSOR);
+yy617:
+	YYDEBUG(617, *YYCURSOR);
 	yych = *++YYCURSOR;
 	YYDEBUG(-1, yych);
 	switch(yych){
@@ -9640,6 +10354,18 @@ yy615:
 	case '6':
 	case '7':
 	case '8':
+<<<<<<< parse_date.c
+	case '9':	goto yy738;
+	case 'A':	case 'a':	goto yy742;
+	case 'D':	case 'd':	goto yy746;
+	case 'F':	case 'f':	goto yy740;
+	case 'J':	case 'j':	goto yy739;
+	case 'M':	case 'm':	goto yy741;
+	case 'N':	case 'n':	goto yy745;
+	case 'O':	case 'o':	goto yy744;
+	case 'S':	case 's':	goto yy743;
+	default:	goto yy619;
+=======
 	case '9':	goto yy738;
 	case 'A':	case 'a':	goto yy742;
 	case 'D':	case 'd':	goto yy746;
@@ -9650,15 +10376,16 @@ yy615:
 	case 'O':	case 'o':	goto yy744;
 	case 'S':	case 's':	goto yy743;
 	default:	goto yy617;
+>>>>>>> 1.55
 	}
-yy616:
-	YYDEBUG(616, *YYCURSOR);
+yy618:
+	YYDEBUG(618, *YYCURSOR);
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 13) YYFILL(13);
 	yych = *YYCURSOR;
-	goto yy617;
-yy617:
-	YYDEBUG(617, *YYCURSOR);
+	goto yy619;
+yy619:
+	YYDEBUG(619, *YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case ' ':
@@ -9675,57 +10402,57 @@ yy617:
 	case '+':
 	case ',':
 	case '-':
-	case '.':	goto yy616;
-	case 'A':	case 'a':	goto yy699;
-	case 'D':	case 'd':	goto yy701;
-	case 'F':	case 'f':	goto yy697;
-	case 'I':	goto yy619;
-	case 'J':	case 'j':	goto yy623;
-	case 'M':	case 'm':	goto yy698;
-	case 'N':	case 'n':	goto yy626;
-	case 'O':	case 'o':	goto yy625;
-	case 'S':	case 's':	goto yy700;
-	case 'V':	goto yy621;
-	case 'X':	goto yy622;
+	case '.':	goto yy618;
+	case 'A':	case 'a':	goto yy701;
+	case 'D':	case 'd':	goto yy703;
+	case 'F':	case 'f':	goto yy699;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy700;
+	case 'N':	case 'n':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'S':	case 's':	goto yy702;
+	case 'V':	goto yy623;
+	case 'X':	goto yy624;
 	default:	goto yy53;
 	}
-yy618:
-	YYDEBUG(618, *YYCURSOR);
+yy620:
+	YYDEBUG(620, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '1'){
-		if(yych <= '/')	goto yy617;
-		if(yych <= '0')	goto yy693;
-		goto yy694;
+		if(yych <= '/')	goto yy619;
+		if(yych <= '0')	goto yy695;
+		goto yy696;
 	} else {
-		if(yych <= '5')	goto yy695;
-		if(yych <= '9')	goto yy696;
-		goto yy617;
+		if(yych <= '5')	goto yy697;
+		if(yych <= '9')	goto yy698;
+		goto yy619;
 	}
-yy619:
-	YYDEBUG(619, *YYCURSOR);
+yy621:
+	YYDEBUG(621, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'H'){
 		if(yych <= '.'){
-			if(yych >= ' ')	goto yy657;
-			goto yy620;
+			if(yych >= ' ')	goto yy659;
+			goto yy622;
 		} else {
-			if(yych <= '/')	goto yy620;
-			if(yych <= '9')	goto yy659;
-			goto yy620;
+			if(yych <= '/')	goto yy622;
+			if(yych <= '9')	goto yy661;
+			goto yy622;
 		}
 	} else {
 		if(yych <= 'V'){
-			if(yych <= 'I')	goto yy692;
-			if(yych >= 'V')	goto yy665;
-			goto yy620;
+			if(yych <= 'I')	goto yy694;
+			if(yych >= 'V')	goto yy667;
+			goto yy622;
 		} else {
-			if(yych == 'X')	goto yy665;
-			goto yy620;
+			if(yych == 'X')	goto yy667;
+			goto yy622;
 		}
 	}
-yy620:
-	YYDEBUG(620, *YYCURSOR);
+yy622:
+	YYDEBUG(622, *YYCURSOR);
 
 #line 1139 "ext/date/lib/parse_date.re"
 {
@@ -9738,115 +10465,115 @@ yy620:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_TEXT;
 	}
-#line 8483 "ext/date/lib/parse_date.c"
-yy621:
-	YYDEBUG(621, *YYCURSOR);
+#line 8857 "ext/date/lib/parse_date.c"
+yy623:
+	YYDEBUG(623, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		goto yy620;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		goto yy622;
 	} else {
-		if(yych <= '9')	goto yy659;
-		if(yych == 'I')	goto yy690;
-		goto yy620;
+		if(yych <= '9')	goto yy661;
+		if(yych == 'I')	goto yy692;
+		goto yy622;
 	}
-yy622:
-	YYDEBUG(622, *YYCURSOR);
+yy624:
+	YYDEBUG(624, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		goto yy620;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		goto yy622;
 	} else {
-		if(yych <= '9')	goto yy659;
-		if(yych == 'I')	goto yy689;
-		goto yy620;
+		if(yych <= '9')	goto yy661;
+		if(yych == 'I')	goto yy691;
+		goto yy622;
 	}
-yy623:
-	YYDEBUG(623, *YYCURSOR);
+yy625:
+	YYDEBUG(625, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
-		if(yych == 'A')	goto yy682;
+		if(yych == 'A')	goto yy684;
 		if(yych <= 'T')	goto yy53;
-		goto yy681;
+		goto yy683;
 	} else {
 		if(yych <= 'a'){
 			if(yych <= '`')	goto yy53;
-			goto yy682;
+			goto yy684;
 		} else {
-			if(yych == 'u')	goto yy681;
+			if(yych == 'u')	goto yy683;
 			goto yy53;
 		}
 	}
-yy624:
-	YYDEBUG(624, *YYCURSOR);
+yy626:
+	YYDEBUG(626, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'T'){
 		if(yych <= 'L'){
-			if(yych == '.')	goto yy629;
+			if(yych == '.')	goto yy631;
 			goto yy53;
 		} else {
-			if(yych <= 'M')	goto yy630;
-			if(yych == 'P')	goto yy675;
+			if(yych <= 'M')	goto yy632;
+			if(yych == 'P')	goto yy677;
 			goto yy53;
 		}
 	} else {
 		if(yych <= 'o'){
-			if(yych <= 'U')	goto yy674;
-			if(yych == 'm')	goto yy630;
+			if(yych <= 'U')	goto yy676;
+			if(yych == 'm')	goto yy632;
 			goto yy53;
 		} else {
-			if(yych <= 'p')	goto yy675;
-			if(yych == 'u')	goto yy674;
+			if(yych <= 'p')	goto yy677;
+			if(yych == 'u')	goto yy676;
 			goto yy53;
 		}
 	}
-yy625:
-	YYDEBUG(625, *YYCURSOR);
+yy627:
+	YYDEBUG(627, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'C')	goto yy669;
-	if(yych == 'c')	goto yy669;
+	if(yych == 'C')	goto yy671;
+	if(yych == 'c')	goto yy671;
 	goto yy53;
-yy626:
-	YYDEBUG(626, *YYCURSOR);
+yy628:
+	YYDEBUG(628, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'O')	goto yy655;
-	if(yych == 'o')	goto yy655;
+	if(yych == 'O')	goto yy657;
+	if(yych == 'o')	goto yy657;
 	goto yy53;
-yy627:
-	YYDEBUG(627, *YYCURSOR);
+yy629:
+	YYDEBUG(629, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
-	if(yych <= '5')	goto yy633;
-	if(yych <= '9')	goto yy635;
+	if(yych <= '5')	goto yy635;
+	if(yych <= '9')	goto yy637;
 	goto yy53;
-yy628:
-	YYDEBUG(628, *YYCURSOR);
+yy630:
+	YYDEBUG(630, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'L'){
 		if(yych != '.')	goto yy53;
-		goto yy629;
+		goto yy631;
 	} else {
-		if(yych <= 'M')	goto yy630;
-		if(yych == 'm')	goto yy630;
+		if(yych <= 'M')	goto yy632;
+		if(yych == 'm')	goto yy632;
 		goto yy53;
 	}
-yy629:
-	YYDEBUG(629, *YYCURSOR);
+yy631:
+	YYDEBUG(631, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'M')	goto yy630;
+	if(yych == 'M')	goto yy632;
 	if(yych != 'm')	goto yy53;
-	goto yy630;
-yy630:
-	YYDEBUG(630, *YYCURSOR);
+	goto yy632;
+yy632:
+	YYDEBUG(632, *YYCURSOR);
 	++YYCURSOR;
-	if((yych = *YYCURSOR) == '.')	goto yy632;
-	goto yy631;
-yy631:
-	YYDEBUG(631, *YYCURSOR);
+	if((yych = *YYCURSOR) == '.')	goto yy634;
+	goto yy633;
+yy633:
+	YYDEBUG(633, *YYCURSOR);
 
 #line 929 "ext/date/lib/parse_date.re"
 {
@@ -9864,25 +10591,25 @@ yy631:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME12;
 	}
-#line 8587 "ext/date/lib/parse_date.c"
-yy632:
-	YYDEBUG(632, *YYCURSOR);
+#line 8961 "ext/date/lib/parse_date.c"
+yy634:
+	YYDEBUG(634, *YYCURSOR);
 	yych = *++YYCURSOR;
-	goto yy631;
-yy633:
-	YYDEBUG(633, *YYCURSOR);
+	goto yy633;
+yy635:
+	YYDEBUG(635, *YYCURSOR);
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
-		if(yych == '.')	goto yy636;
-		goto yy634;
+		if(yych == '.')	goto yy638;
+		goto yy636;
 	} else {
-		if(yych <= '9')	goto yy649;
-		if(yych <= ':')	goto yy636;
-		goto yy634;
+		if(yych <= '9')	goto yy651;
+		if(yych <= ':')	goto yy638;
+		goto yy636;
 	}
-yy634:
-	YYDEBUG(634, *YYCURSOR);
+yy636:
+	YYDEBUG(636, *YYCURSOR);
 
 #line 946 "ext/date/lib/parse_date.re"
 {
@@ -9907,248 +10634,256 @@ yy634:
 		TIMELIB_DEINIT;
 		return TIMELIB_TIME24_WITH_ZONE;
 	}
-#line 8624 "ext/date/lib/parse_date.c"
-yy635:
-	YYDEBUG(635, *YYCURSOR);
-	yyaccept = 11;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych == '.')	goto yy636;
-	if(yych != ':')	goto yy634;
-	goto yy636;
-yy636:
-	YYDEBUG(636, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych <= '/')	goto yy53;
-	if(yych <= '5')	goto yy637;
-	if(yych <= '6')	goto yy638;
-	if(yych <= '9')	goto yy639;
-	goto yy53;
+#line 8998 "ext/date/lib/parse_date.c"
 yy637:
 	YYDEBUG(637, *YYCURSOR);
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych == '.')	goto yy640;
-	if(yych <= '/')	goto yy634;
-	if(yych <= '9')	goto yy643;
-	goto yy634;
+	if(yych == '.')	goto yy638;
+	if(yych != ':')	goto yy636;
+	goto yy638;
 yy638:
 	YYDEBUG(638, *YYCURSOR);
-	yyaccept = 11;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych == '.')	goto yy640;
-	if(yych == '0')	goto yy643;
-	goto yy634;
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy639;
+	if(yych <= '6')	goto yy640;
+	if(yych <= '9')	goto yy641;
+	goto yy53;
 yy639:
 	YYDEBUG(639, *YYCURSOR);
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych != '.')	goto yy634;
-	goto yy640;
+	if(yych == '.')	goto yy642;
+	if(yych <= '/')	goto yy636;
+	if(yych <= '9')	goto yy645;
+	goto yy636;
 yy640:
 	YYDEBUG(640, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych <= '/')	goto yy53;
-	if(yych >= ':')	goto yy53;
-	goto yy641;
+	yyaccept = 11;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == '.')	goto yy642;
+	if(yych == '0')	goto yy645;
+	goto yy636;
 yy641:
 	YYDEBUG(641, *YYCURSOR);
-	++YYCURSOR;
-	if(YYLIMIT == YYCURSOR) YYFILL(1);
-	yych = *YYCURSOR;
+	yyaccept = 11;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych != '.')	goto yy636;
 	goto yy642;
 yy642:
 	YYDEBUG(642, *YYCURSOR);
-	if(yych <= '/')	goto yy634;
-	if(yych <= '9')	goto yy641;
-	goto yy634;
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych >= ':')	goto yy53;
+	goto yy643;
 yy643:
 	YYDEBUG(643, *YYCURSOR);
+	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy644;
+yy644:
+	YYDEBUG(644, *YYCURSOR);
+	if(yych <= '/')	goto yy636;
+	if(yych <= '9')	goto yy643;
+	goto yy636;
+yy645:
+	YYDEBUG(645, *YYCURSOR);
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= 'A'){
-		if(yych <= '-'){
-			if(yych != ' ')	goto yy634;
-			goto yy644;
-		} else {
-			if(yych <= '.')	goto yy640;
-			if(yych <= '@')	goto yy634;
+	if(yych <= '@'){
+		if(yych <= 0x1F){
+			if(yych != 0x09)	goto yy636;
 			goto yy646;
+		} else {
+			if(yych <= ' ')	goto yy646;
+			if(yych == '.')	goto yy642;
+			goto yy636;
 		}
 	} else {
 		if(yych <= '`'){
-			if(yych == 'P')	goto yy646;
-			goto yy634;
+			if(yych <= 'A')	goto yy648;
+			if(yych == 'P')	goto yy648;
+			goto yy636;
 		} else {
-			if(yych <= 'a')	goto yy646;
-			if(yych == 'p')	goto yy646;
-			goto yy634;
+			if(yych <= 'a')	goto yy648;
+			if(yych == 'p')	goto yy648;
+			goto yy636;
 		}
 	}
-yy644:
-	YYDEBUG(644, *YYCURSOR);
+yy646:
+	YYDEBUG(646, *YYCURSOR);
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy645;
-yy645:
-	YYDEBUG(645, *YYCURSOR);
-	if(yych <= 'O'){
-		if(yych <= ' '){
-			if(yych <= 0x1F)	goto yy53;
-			goto yy644;
+	goto yy647;
+yy647:
+	YYDEBUG(647, *YYCURSOR);
+	if(yych <= 'A'){
+		if(yych <= 0x1F){
+			if(yych == 0x09)	goto yy646;
+			goto yy53;
 		} else {
-			if(yych != 'A')	goto yy53;
-			goto yy646;
+			if(yych <= ' ')	goto yy646;
+			if(yych <= '@')	goto yy53;
+			goto yy648;
 		}
 	} else {
-		if(yych <= 'a'){
-			if(yych <= 'P')	goto yy646;
-			if(yych <= '`')	goto yy53;
-			goto yy646;
+		if(yych <= '`'){
+			if(yych != 'P')	goto yy53;
+			goto yy648;
 		} else {
+			if(yych <= 'a')	goto yy648;
 			if(yych != 'p')	goto yy53;
-			goto yy646;
+			goto yy648;
 		}
 	}
-yy646:
-	YYDEBUG(646, *YYCURSOR);
+yy648:
+	YYDEBUG(648, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'L'){
 		if(yych != '.')	goto yy53;
-		goto yy647;
+		goto yy649;
 	} else {
-		if(yych <= 'M')	goto yy648;
-		if(yych == 'm')	goto yy648;
+		if(yych <= 'M')	goto yy650;
+		if(yych == 'm')	goto yy650;
 		goto yy53;
 	}
-yy647:
-	YYDEBUG(647, *YYCURSOR);
+yy649:
+	YYDEBUG(649, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'M')	goto yy648;
+	if(yych == 'M')	goto yy650;
 	if(yych != 'm')	goto yy53;
-	goto yy648;
-yy648:
-	YYDEBUG(648, *YYCURSOR);
+	goto yy650;
+yy650:
+	YYDEBUG(650, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == '.')	goto yy632;
-	goto yy631;
-yy649:
-	YYDEBUG(649, *YYCURSOR);
+	if(yych == '.')	goto yy634;
+	goto yy633;
+yy651:
+	YYDEBUG(651, *YYCURSOR);
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '@'){
-		if(yych <= '-'){
-			if(yych != ' ')	goto yy634;
-			goto yy650;
+	if(yych <= ':'){
+		if(yych <= ' '){
+			if(yych == 0x09)	goto yy652;
+			if(yych <= 0x1F)	goto yy636;
+			goto yy652;
 		} else {
-			if(yych <= '.')	goto yy636;
-			if(yych == ':')	goto yy636;
-			goto yy634;
+			if(yych == '.')	goto yy638;
+			if(yych <= '9')	goto yy636;
+			goto yy638;
 		}
 	} else {
-		if(yych <= '`'){
-			if(yych <= 'A')	goto yy652;
-			if(yych == 'P')	goto yy652;
-			goto yy634;
+		if(yych <= 'P'){
+			if(yych == 'A')	goto yy654;
+			if(yych <= 'O')	goto yy636;
+			goto yy654;
 		} else {
-			if(yych <= 'a')	goto yy652;
-			if(yych == 'p')	goto yy652;
-			goto yy634;
+			if(yych <= 'a'){
+				if(yych <= '`')	goto yy636;
+				goto yy654;
+			} else {
+				if(yych == 'p')	goto yy654;
+				goto yy636;
+			}
 		}
 	}
-yy650:
-	YYDEBUG(650, *YYCURSOR);
+yy652:
+	YYDEBUG(652, *YYCURSOR);
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy651;
-yy651:
-	YYDEBUG(651, *YYCURSOR);
-	if(yych <= 'O'){
-		if(yych <= ' '){
-			if(yych <= 0x1F)	goto yy53;
-			goto yy650;
+	goto yy653;
+yy653:
+	YYDEBUG(653, *YYCURSOR);
+	if(yych <= 'A'){
+		if(yych <= 0x1F){
+			if(yych == 0x09)	goto yy652;
+			goto yy53;
 		} else {
-			if(yych != 'A')	goto yy53;
-			goto yy652;
+			if(yych <= ' ')	goto yy652;
+			if(yych <= '@')	goto yy53;
+			goto yy654;
 		}
 	} else {
-		if(yych <= 'a'){
-			if(yych <= 'P')	goto yy652;
-			if(yych <= '`')	goto yy53;
-			goto yy652;
+		if(yych <= '`'){
+			if(yych != 'P')	goto yy53;
+			goto yy654;
 		} else {
+			if(yych <= 'a')	goto yy654;
 			if(yych != 'p')	goto yy53;
-			goto yy652;
+			goto yy654;
 		}
 	}
-yy652:
-	YYDEBUG(652, *YYCURSOR);
+yy654:
+	YYDEBUG(654, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'L'){
 		if(yych != '.')	goto yy53;
-		goto yy653;
+		goto yy655;
 	} else {
-		if(yych <= 'M')	goto yy654;
-		if(yych == 'm')	goto yy654;
+		if(yych <= 'M')	goto yy656;
+		if(yych == 'm')	goto yy656;
 		goto yy53;
 	}
-yy653:
-	YYDEBUG(653, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'M')	goto yy654;
-	if(yych != 'm')	goto yy53;
-	goto yy654;
-yy654:
-	YYDEBUG(654, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == '.')	goto yy632;
-	goto yy631;
 yy655:
 	YYDEBUG(655, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'V')	goto yy656;
-	if(yych != 'v')	goto yy53;
+	if(yych == 'M')	goto yy656;
+	if(yych != 'm')	goto yy53;
 	goto yy656;
 yy656:
 	YYDEBUG(656, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == '.')	goto yy634;
+	goto yy633;
+yy657:
+	YYDEBUG(657, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'V')	goto yy658;
+	if(yych != 'v')	goto yy53;
+	goto yy658;
+yy658:
+	YYDEBUG(658, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'E'){
-			if(yych <= 'D')	goto yy620;
-			goto yy661;
+			if(yych <= 'D')	goto yy622;
+			goto yy663;
 		} else {
-			if(yych == 'e')	goto yy661;
-			goto yy620;
+			if(yych == 'e')	goto yy663;
+			goto yy622;
 		}
 	}
-yy657:
-	YYDEBUG(657, *YYCURSOR);
+yy659:
+	YYDEBUG(659, *YYCURSOR);
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 4) YYFILL(4);
 	yych = *YYCURSOR;
-	goto yy658;
-yy658:
-	YYDEBUG(658, *YYCURSOR);
+	goto yy660;
+yy660:
+	YYDEBUG(660, *YYCURSOR);
 	if(yych <= 0x1F)	goto yy53;
-	if(yych <= '.')	goto yy657;
+	if(yych <= '.')	goto yy659;
 	if(yych <= '/')	goto yy53;
 	if(yych >= ':')	goto yy53;
-	goto yy659;
-yy659:
-	YYDEBUG(659, *YYCURSOR);
+	goto yy661;
+yy661:
+	YYDEBUG(661, *YYCURSOR);
 	++YYCURSOR;
-	if((yych = *YYCURSOR) <= '/')	goto yy660;
-	if(yych <= '9')	goto yy666;
-	goto yy660;
-yy660:
-	YYDEBUG(660, *YYCURSOR);
+	if((yych = *YYCURSOR) <= '/')	goto yy662;
+	if(yych <= '9')	goto yy668;
+	goto yy662;
+yy662:
+	YYDEBUG(662, *YYCURSOR);
 
 #line 1073 "ext/date/lib/parse_date.re"
 {
@@ -10163,314 +10898,298 @@ yy660:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL;
 	}
-#line 8828 "ext/date/lib/parse_date.c"
-yy661:
-	YYDEBUG(661, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'M')	goto yy662;
-	if(yych != 'm')	goto yy53;
-	goto yy662;
-yy662:
-	YYDEBUG(662, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'B')	goto yy663;
-	if(yych != 'b')	goto yy53;
-	goto yy663;
+#line 9210 "ext/date/lib/parse_date.c"
 yy663:
 	YYDEBUG(663, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'E')	goto yy664;
-	if(yych != 'e')	goto yy53;
+	if(yych == 'M')	goto yy664;
+	if(yych != 'm')	goto yy53;
 	goto yy664;
 yy664:
 	YYDEBUG(664, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'R')	goto yy665;
-	if(yych != 'r')	goto yy53;
+	if(yych == 'B')	goto yy665;
+	if(yych != 'b')	goto yy53;
 	goto yy665;
 yy665:
 	YYDEBUG(665, *YYCURSOR);
-	yyaccept = 10;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= 0x1F)	goto yy620;
-	if(yych <= '.')	goto yy657;
-	if(yych <= '/')	goto yy620;
-	if(yych <= '9')	goto yy659;
-	goto yy620;
+	yych = *++YYCURSOR;
+	if(yych == 'E')	goto yy666;
+	if(yych != 'e')	goto yy53;
+	goto yy666;
 yy666:
 	YYDEBUG(666, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych <= '/')	goto yy660;
-	if(yych >= ':')	goto yy660;
+	if(yych == 'R')	goto yy667;
+	if(yych != 'r')	goto yy53;
 	goto yy667;
 yy667:
 	YYDEBUG(667, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych <= '/')	goto yy660;
-	if(yych >= ':')	goto yy660;
-	goto yy668;
+	yyaccept = 10;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= 0x1F)	goto yy622;
+	if(yych <= '.')	goto yy659;
+	if(yych <= '/')	goto yy622;
+	if(yych <= '9')	goto yy661;
+	goto yy622;
 yy668:
 	YYDEBUG(668, *YYCURSOR);
 	yych = *++YYCURSOR;
-	goto yy660;
+	if(yych <= '/')	goto yy662;
+	if(yych >= ':')	goto yy662;
+	goto yy669;
 yy669:
 	YYDEBUG(669, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'T')	goto yy670;
-	if(yych != 't')	goto yy53;
+	if(yych <= '/')	goto yy662;
+	if(yych >= ':')	goto yy662;
 	goto yy670;
 yy670:
 	YYDEBUG(670, *YYCURSOR);
+	yych = *++YYCURSOR;
+	goto yy662;
+yy671:
+	YYDEBUG(671, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'T')	goto yy672;
+	if(yych != 't')	goto yy53;
+	goto yy672;
+yy672:
+	YYDEBUG(672, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'O'){
-			if(yych <= 'N')	goto yy620;
-			goto yy671;
+			if(yych <= 'N')	goto yy622;
+			goto yy673;
 		} else {
-			if(yych != 'o')	goto yy620;
-			goto yy671;
+			if(yych != 'o')	goto yy622;
+			goto yy673;
 		}
 	}
-yy671:
-	YYDEBUG(671, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'B')	goto yy672;
-	if(yych != 'b')	goto yy53;
-	goto yy672;
-yy672:
-	YYDEBUG(672, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'E')	goto yy673;
-	if(yych != 'e')	goto yy53;
-	goto yy673;
 yy673:
 	YYDEBUG(673, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'R')	goto yy665;
-	if(yych == 'r')	goto yy665;
-	goto yy53;
+	if(yych == 'B')	goto yy674;
+	if(yych != 'b')	goto yy53;
+	goto yy674;
 yy674:
 	YYDEBUG(674, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'G')	goto yy678;
-	if(yych == 'g')	goto yy678;
-	goto yy53;
+	if(yych == 'E')	goto yy675;
+	if(yych != 'e')	goto yy53;
+	goto yy675;
 yy675:
 	YYDEBUG(675, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'R')	goto yy676;
-	if(yych != 'r')	goto yy53;
-	goto yy676;
+	if(yych == 'R')	goto yy667;
+	if(yych == 'r')	goto yy667;
+	goto yy53;
 yy676:
 	YYDEBUG(676, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'G')	goto yy680;
+	if(yych == 'g')	goto yy680;
+	goto yy53;
+yy677:
+	YYDEBUG(677, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy678;
+	if(yych != 'r')	goto yy53;
+	goto yy678;
+yy678:
+	YYDEBUG(678, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'I'){
-			if(yych <= 'H')	goto yy620;
-			goto yy677;
+			if(yych <= 'H')	goto yy622;
+			goto yy679;
 		} else {
-			if(yych != 'i')	goto yy620;
-			goto yy677;
+			if(yych != 'i')	goto yy622;
+			goto yy679;
 		}
 	}
-yy677:
-	YYDEBUG(677, *YYCURSOR);
+yy679:
+	YYDEBUG(679, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'L')	goto yy665;
-	if(yych == 'l')	goto yy665;
+	if(yych == 'L')	goto yy667;
+	if(yych == 'l')	goto yy667;
 	goto yy53;
-yy678:
-	YYDEBUG(678, *YYCURSOR);
+yy680:
+	YYDEBUG(680, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'U'){
-			if(yych <= 'T')	goto yy620;
-			goto yy679;
+			if(yych <= 'T')	goto yy622;
+			goto yy681;
 		} else {
-			if(yych != 'u')	goto yy620;
-			goto yy679;
+			if(yych != 'u')	goto yy622;
+			goto yy681;
 		}
 	}
-yy679:
-	YYDEBUG(679, *YYCURSOR);
+yy681:
+	YYDEBUG(681, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'S')	goto yy680;
+	if(yych == 'S')	goto yy682;
 	if(yych != 's')	goto yy53;
-	goto yy680;
-yy680:
-	YYDEBUG(680, *YYCURSOR);
+	goto yy682;
+yy682:
+	YYDEBUG(682, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'T')	goto yy665;
-	if(yych == 't')	goto yy665;
+	if(yych == 'T')	goto yy667;
+	if(yych == 't')	goto yy667;
 	goto yy53;
-yy681:
-	YYDEBUG(681, *YYCURSOR);
+yy683:
+	YYDEBUG(683, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
-		if(yych == 'L')	goto yy688;
+		if(yych == 'L')	goto yy690;
 		if(yych <= 'M')	goto yy53;
-		goto yy687;
+		goto yy689;
 	} else {
 		if(yych <= 'l'){
 			if(yych <= 'k')	goto yy53;
-			goto yy688;
+			goto yy690;
 		} else {
-			if(yych == 'n')	goto yy687;
+			if(yych == 'n')	goto yy689;
 			goto yy53;
 		}
 	}
-yy682:
-	YYDEBUG(682, *YYCURSOR);
+yy684:
+	YYDEBUG(684, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'N')	goto yy683;
+	if(yych == 'N')	goto yy685;
 	if(yych != 'n')	goto yy53;
-	goto yy683;
-yy683:
-	YYDEBUG(683, *YYCURSOR);
+	goto yy685;
+yy685:
+	YYDEBUG(685, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'U'){
-			if(yych <= 'T')	goto yy620;
-			goto yy684;
+			if(yych <= 'T')	goto yy622;
+			goto yy686;
 		} else {
-			if(yych != 'u')	goto yy620;
-			goto yy684;
+			if(yych != 'u')	goto yy622;
+			goto yy686;
 		}
 	}
-yy684:
-	YYDEBUG(684, *YYCURSOR);
+yy686:
+	YYDEBUG(686, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'A')	goto yy685;
+	if(yych == 'A')	goto yy687;
 	if(yych != 'a')	goto yy53;
-	goto yy685;
-yy685:
-	YYDEBUG(685, *YYCURSOR);
+	goto yy687;
+yy687:
+	YYDEBUG(687, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'R')	goto yy686;
+	if(yych == 'R')	goto yy688;
 	if(yych != 'r')	goto yy53;
-	goto yy686;
-yy686:
-	YYDEBUG(686, *YYCURSOR);
+	goto yy688;
+yy688:
+	YYDEBUG(688, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'Y')	goto yy665;
-	if(yych == 'y')	goto yy665;
+	if(yych == 'Y')	goto yy667;
+	if(yych == 'y')	goto yy667;
 	goto yy53;
-yy687:
-	YYDEBUG(687, *YYCURSOR);
+yy689:
+	YYDEBUG(689, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'E'){
-			if(yych <= 'D')	goto yy620;
-			goto yy665;
+			if(yych <= 'D')	goto yy622;
+			goto yy667;
 		} else {
-			if(yych == 'e')	goto yy665;
-			goto yy620;
+			if(yych == 'e')	goto yy667;
+			goto yy622;
 		}
 	}
-yy688:
-	YYDEBUG(688, *YYCURSOR);
+yy690:
+	YYDEBUG(690, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'Y'){
-			if(yych <= 'X')	goto yy620;
-			goto yy665;
+			if(yych <= 'X')	goto yy622;
+			goto yy667;
 		} else {
-			if(yych == 'y')	goto yy665;
-			goto yy620;
+			if(yych == 'y')	goto yy667;
+			goto yy622;
 		}
 	}
-yy689:
-	YYDEBUG(689, *YYCURSOR);
-	yyaccept = 10;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '/'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		goto yy620;
-	} else {
-		if(yych <= '9')	goto yy659;
-		if(yych == 'I')	goto yy665;
-		goto yy620;
-	}
-yy690:
-	YYDEBUG(690, *YYCURSOR);
-	yyaccept = 10;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '/'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		goto yy620;
-	} else {
-		if(yych <= '9')	goto yy659;
-		if(yych != 'I')	goto yy620;
-		goto yy691;
-	}
 yy691:
 	YYDEBUG(691, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		goto yy620;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		goto yy622;
 	} else {
-		if(yych <= '9')	goto yy659;
-		if(yych == 'I')	goto yy665;
-		goto yy620;
+		if(yych <= '9')	goto yy661;
+		if(yych == 'I')	goto yy667;
+		goto yy622;
 	}
 yy692:
 	YYDEBUG(692, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		goto yy620;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		goto yy622;
 	} else {
-		if(yych <= '9')	goto yy659;
-		if(yych == 'I')	goto yy665;
-		goto yy620;
+		if(yych <= '9')	goto yy661;
+		if(yych != 'I')	goto yy622;
+		goto yy693;
 	}
 yy693:
 	YYDEBUG(693, *YYCURSOR);
-	yyaccept = 11;
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= '/'){
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		goto yy622;
+	} else {
+		if(yych <= '9')	goto yy661;
+		if(yych == 'I')	goto yy667;
+		goto yy622;
+=======
 	if(yych <= '.'){
 		if(yych <= ',')	goto yy634;
 		if(yych <= '-')	goto yy724;
@@ -10480,12 +11199,22 @@ yy693:
 		if(yych <= '9')	goto yy735;
 		if(yych <= ':')	goto yy636;
 		goto yy634;
+>>>>>>> 1.55
 	}
 yy694:
 	YYDEBUG(694, *YYCURSOR);
-	yyaccept = 11;
+	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
+<<<<<<< parse_date.c
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		goto yy622;
+	} else {
+		if(yych <= '9')	goto yy661;
+		if(yych == 'I')	goto yy667;
+		goto yy622;
+=======
 		if(yych <= ',')	goto yy634;
 		if(yych <= '-')	goto yy724;
 		if(yych <= '.')	goto yy725;
@@ -10495,25 +11224,49 @@ yy694:
 		if(yych <= '9')	goto yy649;
 		if(yych <= ':')	goto yy636;
 		goto yy634;
+>>>>>>> 1.55
 	}
 yy695:
 	YYDEBUG(695, *YYCURSOR);
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= '/'){
+		if(yych == '.')	goto yy726;
+		goto yy636;
+=======
 	if(yych <= '.'){
 		if(yych <= ',')	goto yy634;
 		if(yych <= '-')	goto yy724;
 		goto yy725;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= '9')	goto yy735;
+		if(yych <= ':')	goto yy638;
+		goto yy636;
+=======
 		if(yych <= '/')	goto yy634;
 		if(yych <= '9')	goto yy649;
 		if(yych <= ':')	goto yy636;
 		goto yy634;
+>>>>>>> 1.55
 	}
 yy696:
 	YYDEBUG(696, *YYCURSOR);
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= '/'){
+		if(yych == '.')	goto yy726;
+		goto yy636;
+	} else {
+		if(yych <= '2')	goto yy735;
+		if(yych <= '9')	goto yy651;
+		if(yych <= ':')	goto yy638;
+		goto yy636;
+	}
+=======
 	if(yych <= '.'){
 		if(yych <= ',')	goto yy634;
 		if(yych <= '-')	goto yy724;
@@ -10522,254 +11275,284 @@ yy696:
 		if(yych == ':')	goto yy636;
 		goto yy634;
 	}
+>>>>>>> 1.55
 yy697:
 	YYDEBUG(697, *YYCURSOR);
+	yyaccept = 11;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= '/'){
+		if(yych == '.')	goto yy726;
+		goto yy636;
+	} else {
+		if(yych <= '9')	goto yy651;
+		if(yych <= ':')	goto yy638;
+		goto yy636;
+	}
+yy698:
+	YYDEBUG(698, *YYCURSOR);
+	yyaccept = 11;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == '.')	goto yy726;
+	if(yych == ':')	goto yy638;
+	goto yy636;
+yy699:
+	YYDEBUG(699, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'E')	goto yy718;
-	if(yych == 'e')	goto yy718;
+	if(yych == 'E')	goto yy720;
+	if(yych == 'e')	goto yy720;
 	goto yy53;
-yy698:
-	YYDEBUG(698, *YYCURSOR);
+yy700:
+	YYDEBUG(700, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'A')	goto yy715;
-	if(yych == 'a')	goto yy715;
+	if(yych == 'A')	goto yy717;
+	if(yych == 'a')	goto yy717;
 	goto yy53;
-yy699:
-	YYDEBUG(699, *YYCURSOR);
+yy701:
+	YYDEBUG(701, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
-		if(yych == 'P')	goto yy675;
+		if(yych == 'P')	goto yy677;
 		if(yych <= 'T')	goto yy53;
-		goto yy674;
+		goto yy676;
 	} else {
 		if(yych <= 'p'){
 			if(yych <= 'o')	goto yy53;
-			goto yy675;
+			goto yy677;
 		} else {
-			if(yych == 'u')	goto yy674;
+			if(yych == 'u')	goto yy676;
 			goto yy53;
 		}
 	}
-yy700:
-	YYDEBUG(700, *YYCURSOR);
+yy702:
+	YYDEBUG(702, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'E')	goto yy708;
-	if(yych == 'e')	goto yy708;
+	if(yych == 'E')	goto yy710;
+	if(yych == 'e')	goto yy710;
 	goto yy53;
-yy701:
-	YYDEBUG(701, *YYCURSOR);
+yy703:
+	YYDEBUG(703, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'E')	goto yy702;
+	if(yych == 'E')	goto yy704;
 	if(yych != 'e')	goto yy53;
-	goto yy702;
-yy702:
-	YYDEBUG(702, *YYCURSOR);
+	goto yy704;
+yy704:
+	YYDEBUG(704, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'C')	goto yy703;
+	if(yych == 'C')	goto yy705;
 	if(yych != 'c')	goto yy53;
-	goto yy703;
-yy703:
-	YYDEBUG(703, *YYCURSOR);
+	goto yy705;
+yy705:
+	YYDEBUG(705, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'E'){
-			if(yych <= 'D')	goto yy620;
-			goto yy704;
+			if(yych <= 'D')	goto yy622;
+			goto yy706;
 		} else {
-			if(yych != 'e')	goto yy620;
-			goto yy704;
+			if(yych != 'e')	goto yy622;
+			goto yy706;
 		}
 	}
-yy704:
-	YYDEBUG(704, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'M')	goto yy705;
-	if(yych != 'm')	goto yy53;
-	goto yy705;
-yy705:
-	YYDEBUG(705, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'B')	goto yy706;
-	if(yych != 'b')	goto yy53;
-	goto yy706;
 yy706:
 	YYDEBUG(706, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'E')	goto yy707;
-	if(yych != 'e')	goto yy53;
+	if(yych == 'M')	goto yy707;
+	if(yych != 'm')	goto yy53;
 	goto yy707;
 yy707:
 	YYDEBUG(707, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'R')	goto yy665;
-	if(yych == 'r')	goto yy665;
-	goto yy53;
+	if(yych == 'B')	goto yy708;
+	if(yych != 'b')	goto yy53;
+	goto yy708;
 yy708:
 	YYDEBUG(708, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'P')	goto yy709;
-	if(yych != 'p')	goto yy53;
+	if(yych == 'E')	goto yy709;
+	if(yych != 'e')	goto yy53;
 	goto yy709;
 yy709:
 	YYDEBUG(709, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy667;
+	if(yych == 'r')	goto yy667;
+	goto yy53;
+yy710:
+	YYDEBUG(710, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'P')	goto yy711;
+	if(yych != 'p')	goto yy53;
+	goto yy711;
+yy711:
+	YYDEBUG(711, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'T'){
-			if(yych <= 'S')	goto yy620;
-			goto yy710;
+			if(yych <= 'S')	goto yy622;
+			goto yy712;
 		} else {
-			if(yych != 't')	goto yy620;
-			goto yy710;
+			if(yych != 't')	goto yy622;
+			goto yy712;
 		}
 	}
-yy710:
-	YYDEBUG(710, *YYCURSOR);
+yy712:
+	YYDEBUG(712, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'E'){
-			if(yych <= 'D')	goto yy620;
-			goto yy711;
+			if(yych <= 'D')	goto yy622;
+			goto yy713;
 		} else {
-			if(yych != 'e')	goto yy620;
-			goto yy711;
+			if(yych != 'e')	goto yy622;
+			goto yy713;
 		}
 	}
-yy711:
-	YYDEBUG(711, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'M')	goto yy712;
-	if(yych != 'm')	goto yy53;
-	goto yy712;
-yy712:
-	YYDEBUG(712, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'B')	goto yy713;
-	if(yych != 'b')	goto yy53;
-	goto yy713;
 yy713:
 	YYDEBUG(713, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'E')	goto yy714;
-	if(yych != 'e')	goto yy53;
+	if(yych == 'M')	goto yy714;
+	if(yych != 'm')	goto yy53;
 	goto yy714;
 yy714:
 	YYDEBUG(714, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'R')	goto yy665;
-	if(yych == 'r')	goto yy665;
-	goto yy53;
+	if(yych == 'B')	goto yy715;
+	if(yych != 'b')	goto yy53;
+	goto yy715;
 yy715:
 	YYDEBUG(715, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych == 'E')	goto yy716;
+	if(yych != 'e')	goto yy53;
+	goto yy716;
+yy716:
+	YYDEBUG(716, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy667;
+	if(yych == 'r')	goto yy667;
+	goto yy53;
+yy717:
+	YYDEBUG(717, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if(yych <= 'Y'){
-		if(yych == 'R')	goto yy716;
+		if(yych == 'R')	goto yy718;
 		if(yych <= 'X')	goto yy53;
-		goto yy665;
+		goto yy667;
 	} else {
 		if(yych <= 'r'){
 			if(yych <= 'q')	goto yy53;
-			goto yy716;
+			goto yy718;
 		} else {
-			if(yych == 'y')	goto yy665;
+			if(yych == 'y')	goto yy667;
 			goto yy53;
 		}
 	}
-yy716:
-	YYDEBUG(716, *YYCURSOR);
+yy718:
+	YYDEBUG(718, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'C'){
-			if(yych <= 'B')	goto yy620;
-			goto yy717;
+			if(yych <= 'B')	goto yy622;
+			goto yy719;
 		} else {
-			if(yych != 'c')	goto yy620;
-			goto yy717;
+			if(yych != 'c')	goto yy622;
+			goto yy719;
 		}
 	}
-yy717:
-	YYDEBUG(717, *YYCURSOR);
+yy719:
+	YYDEBUG(719, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'H')	goto yy665;
-	if(yych == 'h')	goto yy665;
+	if(yych == 'H')	goto yy667;
+	if(yych == 'h')	goto yy667;
 	goto yy53;
-yy718:
-	YYDEBUG(718, *YYCURSOR);
+yy720:
+	YYDEBUG(720, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'B')	goto yy719;
+	if(yych == 'B')	goto yy721;
 	if(yych != 'b')	goto yy53;
-	goto yy719;
-yy719:
-	YYDEBUG(719, *YYCURSOR);
+	goto yy721;
+yy721:
+	YYDEBUG(721, *YYCURSOR);
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
-		if(yych <= 0x1F)	goto yy620;
-		if(yych <= '.')	goto yy657;
-		if(yych <= '/')	goto yy620;
-		goto yy659;
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		goto yy661;
 	} else {
 		if(yych <= 'R'){
-			if(yych <= 'Q')	goto yy620;
-			goto yy720;
+			if(yych <= 'Q')	goto yy622;
+			goto yy722;
 		} else {
-			if(yych != 'r')	goto yy620;
-			goto yy720;
+			if(yych != 'r')	goto yy622;
+			goto yy722;
 		}
 	}
-yy720:
-	YYDEBUG(720, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'U')	goto yy721;
-	if(yych != 'u')	goto yy53;
-	goto yy721;
-yy721:
-	YYDEBUG(721, *YYCURSOR);
-	yych = *++YYCURSOR;
-	if(yych == 'A')	goto yy722;
-	if(yych != 'a')	goto yy53;
-	goto yy722;
 yy722:
 	YYDEBUG(722, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'R')	goto yy723;
-	if(yych != 'r')	goto yy53;
+	if(yych == 'U')	goto yy723;
+	if(yych != 'u')	goto yy53;
 	goto yy723;
 yy723:
 	YYDEBUG(723, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych == 'Y')	goto yy665;
-	if(yych == 'y')	goto yy665;
-	goto yy53;
+	if(yych == 'A')	goto yy724;
+	if(yych != 'a')	goto yy53;
+	goto yy724;
 yy724:
 	YYDEBUG(724, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy725;
+	if(yych != 'r')	goto yy53;
+	goto yy725;
+yy725:
+	YYDEBUG(725, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'Y')	goto yy667;
+	if(yych == 'y')	goto yy667;
+	goto yy53;
+yy726:
+	YYDEBUG(726, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '5')	goto yy727;
+	if(yych <= '6')	goto yy728;
+	if(yych <= '9')	goto yy729;
+=======
 	if(yych <= '9')	goto yy734;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy727:
+	YYDEBUG(727, *YYCURSOR);
+=======
 yy725:
 	YYDEBUG(725, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -10780,28 +11563,63 @@ yy725:
 	goto yy53;
 yy726:
 	YYDEBUG(726, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == '.')	goto yy642;
+	if(yych <= '/')	goto yy636;
+	if(yych <= '9')	goto yy734;
+	goto yy636;
+yy728:
+	YYDEBUG(728, *YYCURSOR);
+=======
 	if(yych == '.')	goto yy640;
 	if(yych <= '/')	goto yy634;
 	if(yych <= '9')	goto yy733;
 	goto yy634;
 yy727:
 	YYDEBUG(727, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
-		if(yych == '.')	goto yy640;
-		goto yy634;
-	} else {
+		if(yych == '.')	goto yy642;
+		goto yy636;
+	} else {
+<<<<<<< parse_date.c
+		if(yych <= '0')	goto yy734;
+		if(yych <= '9')	goto yy730;
+		goto yy636;
+=======
 		if(yych <= '0')	goto yy733;
 		if(yych <= '9')	goto yy729;
 		goto yy634;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy729:
+	YYDEBUG(729, *YYCURSOR);
+=======
 yy728:
 	YYDEBUG(728, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == '.')	goto yy642;
+	if(yych <= '/')	goto yy636;
+	if(yych >= ':')	goto yy636;
+	goto yy730;
+yy730:
+	YYDEBUG(730, *YYCURSOR);
+	++YYCURSOR;
+	if((yych = *YYCURSOR) <= '/')	goto yy731;
+	if(yych <= '9')	goto yy732;
+	goto yy731;
+yy731:
+	YYDEBUG(731, *YYCURSOR);
+=======
 	if(yych == '.')	goto yy640;
 	if(yych <= '/')	goto yy634;
 	if(yych >= ':')	goto yy634;
@@ -10814,6 +11632,7 @@ yy729:
 	goto yy730;
 yy730:
 	YYDEBUG(730, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1087 "ext/date/lib/parse_date.re"
 {
@@ -10827,6 +11646,21 @@ yy730:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_FULL_POINTED;
 	}
+<<<<<<< parse_date.c
+#line 9719 "ext/date/lib/parse_date.c"
+yy732:
+	YYDEBUG(732, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy731;
+	if(yych >= ':')	goto yy731;
+	goto yy733;
+yy733:
+	YYDEBUG(733, *YYCURSOR);
+	yych = *++YYCURSOR;
+	goto yy731;
+yy734:
+	YYDEBUG(734, *YYCURSOR);
+=======
 #line 9352 "ext/date/lib/parse_date.c"
 yy731:
 	YYDEBUG(731, *YYCURSOR);
@@ -10840,13 +11674,34 @@ yy732:
 	goto yy730;
 yy733:
 	YYDEBUG(733, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yych <= '@'){
-		if(yych <= '-'){
-			if(yych == ' ')	goto yy644;
-			goto yy634;
+	if(yych <= '9'){
+		if(yych <= ' '){
+			if(yych == 0x09)	goto yy646;
+			if(yych <= 0x1F)	goto yy636;
+			goto yy646;
+		} else {
+<<<<<<< parse_date.c
+			if(yych == '.')	goto yy642;
+			if(yych <= '/')	goto yy636;
+			goto yy732;
+		}
+	} else {
+		if(yych <= 'P'){
+			if(yych == 'A')	goto yy648;
+			if(yych <= 'O')	goto yy636;
+			goto yy648;
 		} else {
+			if(yych <= 'a'){
+				if(yych <= '`')	goto yy636;
+				goto yy648;
+			} else {
+				if(yych == 'p')	goto yy648;
+				goto yy636;
+			}
+=======
 			if(yych <= '.')	goto yy640;
 			if(yych <= '/')	goto yy634;
 			if(yych <= '9')	goto yy731;
@@ -10861,8 +11716,13 @@ yy733:
 			if(yych <= 'a')	goto yy646;
 			if(yych == 'p')	goto yy646;
 			goto yy634;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy735:
+	YYDEBUG(735, *YYCURSOR);
+=======
 yy734:
 	YYDEBUG(734, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -10871,14 +11731,42 @@ yy734:
 	goto yy730;
 yy735:
 	YYDEBUG(735, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= ':'){
+		if(yych <= ' '){
+			if(yych == 0x09)	goto yy652;
+			if(yych <= 0x1F)	goto yy636;
+			goto yy652;
+=======
 	if(yych <= '@'){
 		if(yych <= '-'){
 			if(yych == ' ')	goto yy650;
 			if(yych <= ',')	goto yy634;
 			goto yy724;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == '.')	goto yy726;
+			if(yych <= '9')	goto yy636;
+			goto yy638;
+		}
+	} else {
+		if(yych <= 'P'){
+			if(yych == 'A')	goto yy654;
+			if(yych <= 'O')	goto yy636;
+			goto yy654;
+		} else {
+			if(yych <= 'a'){
+				if(yych <= '`')	goto yy636;
+				goto yy654;
+			} else {
+				if(yych == 'p')	goto yy654;
+				goto yy636;
+			}
+=======
 			if(yych <= '.')	goto yy725;
 			if(yych == ':')	goto yy636;
 			goto yy634;
@@ -10892,11 +11780,37 @@ yy735:
 			if(yych <= 'a')	goto yy652;
 			if(yych == 'p')	goto yy652;
 			goto yy634;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy736:
+	YYDEBUG(736, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == '-')	goto yy775;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy738;
+	goto yy53;
+yy737:
+	YYDEBUG(737, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == '-')	goto yy775;
+	if(yych <= '/')	goto yy53;
+	if(yych >= '3')	goto yy53;
+	goto yy738;
+yy738:
+	YYDEBUG(738, *YYCURSOR);
+=======
 yy736:
 	YYDEBUG(736, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == '-')	goto yy775;
+	goto yy53;
+yy739:
+	YYDEBUG(739, *YYCURSOR);
+=======
 	if(yych <= '.'){
 		if(yych <= ',')	goto yy53;
 		if(yych <= '-')	goto yy775;
@@ -10908,6 +11822,7 @@ yy736:
 	}
 yy737:
 	YYDEBUG(737, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '.'){
 		if(yych <= ',')	goto yy53;
@@ -11005,23 +11920,33 @@ yy748:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'E'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'D')	goto yy620;
-			goto yy704;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'D')	goto yy622;
+			goto yy706;
 		} else {
-			if(yych == 'e')	goto yy704;
-			goto yy620;
+			if(yych == 'e')	goto yy706;
+			goto yy622;
 		}
 	}
+<<<<<<< parse_date.c
+yy749:
+	YYDEBUG(749, *YYCURSOR);
+=======
 yy749:
 	YYDEBUG(749, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -11039,81 +11964,190 @@ yy750:
 	goto yy660;
 yy751:
 	YYDEBUG(751, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy660;
+<<<<<<< parse_date.c
+	if(yych <= '0')	goto yy750;
+	if(yych <= '2')	goto yy751;
+	if(yych <= '3')	goto yy752;
+=======
 	if(yych <= '9')	goto yy753;
+>>>>>>> 1.55
 	goto yy660;
 yy752:
 	YYDEBUG(752, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy662;
+	if(yych <= '0')	goto yy668;
+	if(yych <= '9')	goto yy753;
+	goto yy662;
+yy751:
+	YYDEBUG(751, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy660;
 	if(yych <= '1')	goto yy753;
 	if(yych <= '9')	goto yy666;
 	goto yy660;
 yy753:
 	YYDEBUG(753, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy662;
+	if(yych <= '9')	goto yy753;
+	goto yy662;
+yy752:
+	YYDEBUG(752, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy660;
 	if(yych <= '9')	goto yy667;
 	goto yy660;
 yy754:
 	YYDEBUG(754, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy662;
+	if(yych <= '1')	goto yy753;
+	if(yych <= '9')	goto yy668;
+	goto yy662;
+yy753:
+	YYDEBUG(753, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy662;
+	if(yych <= '9')	goto yy669;
+	goto yy662;
+yy754:
+	YYDEBUG(754, *YYCURSOR);
+=======
+	if(yych == 'V')	goto yy755;
+	if(yych != 'v')	goto yy53;
+	goto yy755;
+yy755:
+	YYDEBUG(755, *YYCURSOR);
+	yyaccept = 10;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= '/'){
+		if(yych <= ','){
+			if(yych <= 0x1F)	goto yy620;
+			goto yy657;
+		} else {
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy657;
+			goto yy620;
+		}
+	} else {
+		if(yych <= 'E'){
+			if(yych <= '9')	goto yy659;
+			if(yych <= 'D')	goto yy620;
+			goto yy661;
+		} else {
+			if(yych == 'e')	goto yy661;
+			goto yy620;
+		}
+	}
+yy756:
+	YYDEBUG(756, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
 	if(yych == 'V')	goto yy755;
 	if(yych != 'v')	goto yy53;
 	goto yy755;
 yy755:
 	YYDEBUG(755, *YYCURSOR);
+=======
+	if(yych == 'T')	goto yy757;
+	if(yych != 't')	goto yy53;
+	goto yy757;
+yy757:
+	YYDEBUG(757, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'E'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'D')	goto yy620;
-			goto yy661;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'D')	goto yy622;
+			goto yy663;
 		} else {
-			if(yych == 'e')	goto yy661;
-			goto yy620;
+			if(yych == 'e')	goto yy663;
+			goto yy622;
 		}
 	}
-yy756:
-	YYDEBUG(756, *YYCURSOR);
+yy758:
+	YYDEBUG(758, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
 	if(yych == 'T')	goto yy757;
 	if(yych != 't')	goto yy53;
 	goto yy757;
 yy757:
 	YYDEBUG(757, *YYCURSOR);
+=======
+	if(yych == 'P')	goto yy759;
+	if(yych != 'p')	goto yy53;
+	goto yy759;
+yy759:
+	YYDEBUG(759, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
+<<<<<<< parse_date.c
 		if(yych <= 'O'){
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'N')	goto yy622;
+			goto yy673;
+=======
+		if(yych <= 'T'){
 			if(yych <= '9')	goto yy659;
-			if(yych <= 'N')	goto yy620;
-			goto yy671;
+			if(yych <= 'S')	goto yy620;
+			goto yy760;
+>>>>>>> 1.55
 		} else {
-			if(yych == 'o')	goto yy671;
-			goto yy620;
+<<<<<<< parse_date.c
+			if(yych == 'o')	goto yy673;
+			goto yy622;
+=======
+			if(yych != 't')	goto yy620;
+			goto yy760;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
 yy758:
 	YYDEBUG(758, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -11122,50 +12156,84 @@ yy758:
 	goto yy759;
 yy759:
 	YYDEBUG(759, *YYCURSOR);
+=======
+yy760:
+	YYDEBUG(760, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'T'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'S')	goto yy620;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'S')	goto yy622;
 			goto yy760;
 		} else {
-			if(yych != 't')	goto yy620;
+			if(yych != 't')	goto yy622;
 			goto yy760;
 		}
 	}
+<<<<<<< parse_date.c
 yy760:
 	YYDEBUG(760, *YYCURSOR);
+=======
+yy761:
+	YYDEBUG(761, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'G')	goto yy764;
+	if(yych == 'g')	goto yy764;
+	goto yy53;
+yy762:
+	YYDEBUG(762, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy763;
+	if(yych != 'r')	goto yy53;
+	goto yy763;
+yy763:
+	YYDEBUG(763, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'E'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'D')	goto yy620;
-			goto yy711;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'D')	goto yy622;
+			goto yy713;
 		} else {
-			if(yych == 'e')	goto yy711;
-			goto yy620;
+			if(yych == 'e')	goto yy713;
+			goto yy622;
 		}
 	}
+<<<<<<< parse_date.c
 yy761:
 	YYDEBUG(761, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -11184,44 +12252,54 @@ yy763:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
 			if(yych <= '-')	goto yy749;
-			if(yych <= '.')	goto yy657;
-			goto yy620;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
 		}
 	} else {
 		if(yych <= 'I'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'H')	goto yy620;
-			goto yy677;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'H')	goto yy622;
+			goto yy679;
 		} else {
-			if(yych == 'i')	goto yy677;
-			goto yy620;
+			if(yych == 'i')	goto yy679;
+			goto yy622;
 		}
 	}
 yy764:
 	YYDEBUG(764, *YYCURSOR);
+=======
+yy764:
+	YYDEBUG(764, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'U'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'T')	goto yy620;
-			goto yy679;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'T')	goto yy622;
+			goto yy681;
 		} else {
-			if(yych == 'u')	goto yy679;
-			goto yy620;
+			if(yych == 'u')	goto yy681;
+			goto yy622;
 		}
 	}
 yy765:
@@ -11246,21 +12324,27 @@ yy766:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'C'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'B')	goto yy620;
-			goto yy717;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'B')	goto yy622;
+			goto yy719;
 		} else {
-			if(yych == 'c')	goto yy717;
-			goto yy620;
+			if(yych == 'c')	goto yy719;
+			goto yy622;
 		}
 	}
 yy767:
@@ -11268,6 +12352,16 @@ yy767:
 	yyaccept = 10;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '-'){
+<<<<<<< parse_date.c
+		if(yych <= 0x1F)	goto yy622;
+		if(yych <= ',')	goto yy659;
+		goto yy749;
+	} else {
+		if(yych <= '.')	goto yy659;
+		if(yych <= '/')	goto yy622;
+		if(yych <= '9')	goto yy661;
+		goto yy622;
+=======
 		if(yych <= 0x1F)	goto yy620;
 		if(yych <= ',')	goto yy657;
 		goto yy749;
@@ -11276,6 +12370,7 @@ yy767:
 		if(yych <= '/')	goto yy620;
 		if(yych <= '9')	goto yy659;
 		goto yy620;
+>>>>>>> 1.55
 	}
 yy768:
 	YYDEBUG(768, *YYCURSOR);
@@ -11289,21 +12384,27 @@ yy769:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'R'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'Q')	goto yy620;
-			goto yy720;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'Q')	goto yy622;
+			goto yy722;
 		} else {
-			if(yych == 'r')	goto yy720;
-			goto yy620;
+			if(yych == 'r')	goto yy722;
+			goto yy622;
 		}
 	}
 yy770:
@@ -11334,21 +12435,27 @@ yy772:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'U'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'T')	goto yy620;
-			goto yy684;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'T')	goto yy622;
+			goto yy686;
 		} else {
-			if(yych == 'u')	goto yy684;
-			goto yy620;
+			if(yych == 'u')	goto yy686;
+			goto yy622;
 		}
 	}
 yy773:
@@ -11357,21 +12464,27 @@ yy773:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'E'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'D')	goto yy620;
-			goto yy665;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'D')	goto yy622;
+			goto yy667;
 		} else {
-			if(yych == 'e')	goto yy665;
-			goto yy620;
+			if(yych == 'e')	goto yy667;
+			goto yy622;
 		}
 	}
 yy774:
@@ -11380,21 +12493,27 @@ yy774:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych <= ','){
-			if(yych <= 0x1F)	goto yy620;
-			goto yy657;
+			if(yych <= 0x1F)	goto yy622;
+			goto yy659;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '-')	goto yy749;
+			if(yych <= '.')	goto yy659;
+			goto yy622;
+=======
 			if(yych <= '-')	goto yy749;
 			if(yych <= '.')	goto yy657;
 			goto yy620;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'Y'){
-			if(yych <= '9')	goto yy659;
-			if(yych <= 'X')	goto yy620;
-			goto yy665;
+			if(yych <= '9')	goto yy661;
+			if(yych <= 'X')	goto yy622;
+			goto yy667;
 		} else {
-			if(yych == 'y')	goto yy665;
-			goto yy620;
+			if(yych == 'y')	goto yy667;
+			goto yy622;
 		}
 	}
 yy775:
@@ -11410,10 +12529,17 @@ yy776:
 	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych <= '/')	goto yy777;
+		if(yych <= '9')	goto yy779;
+		if(yych >= 'n')	goto yy781;
+		goto yy777;
+=======
 		if(yych <= '/')	goto yy777;
 		if(yych <= '9')	goto yy785;
 		if(yych >= 'n')	goto yy781;
 		goto yy777;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
 			if(yych >= 'r')	goto yy782;
@@ -11439,12 +12565,24 @@ yy777:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
+<<<<<<< parse_date.c
+#line 10229 "ext/date/lib/parse_date.c"
+yy778:
+	YYDEBUG(778, *YYCURSOR);
+=======
 #line 9870 "ext/date/lib/parse_date.c"
 yy778:
 	YYDEBUG(778, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych <= '/')	goto yy777;
+		if(yych <= '1')	goto yy779;
+		if(yych <= 'm')	goto yy777;
+		goto yy781;
+=======
 		if(yych <= '1'){
 			if(yych <= '/')	goto yy777;
 			goto yy785;
@@ -11453,6 +12591,7 @@ yy778:
 			if(yych <= 'm')	goto yy777;
 			goto yy781;
 		}
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
 			if(yych <= 'q')	goto yy777;
@@ -11467,12 +12606,24 @@ yy779:
 	YYDEBUG(779, *YYCURSOR);
 	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'q'){
+		if(yych == 'n')	goto yy781;
+		goto yy777;
+=======
 	if(yych <= 'n'){
 		if(yych <= '/')	goto yy777;
 		if(yych <= '9')	goto yy729;
 		if(yych <= 'm')	goto yy777;
 		goto yy781;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'r')	goto yy782;
+		if(yych <= 's')	goto yy780;
+		if(yych <= 't')	goto yy783;
+		goto yy777;
+=======
 		if(yych <= 'r'){
 			if(yych <= 'q')	goto yy777;
 			goto yy782;
@@ -11481,6 +12632,7 @@ yy779:
 			if(yych <= 't')	goto yy783;
 			goto yy777;
 		}
+>>>>>>> 1.55
 	}
 yy780:
 	YYDEBUG(780, *YYCURSOR);
@@ -11499,6 +12651,17 @@ yy782:
 	goto yy53;
 yy783:
 	YYDEBUG(783, *YYCURSOR);
+<<<<<<< parse_date.c
+	yych = *++YYCURSOR;
+	if(yych != 'h')	goto yy53;
+	goto yy784;
+yy784:
+	YYDEBUG(784, *YYCURSOR);
+	yych = *++YYCURSOR;
+	goto yy777;
+yy785:
+	YYDEBUG(785, *YYCURSOR);
+=======
 	yych = *++YYCURSOR;
 	if(yych != 'h')	goto yy53;
 	goto yy784;
@@ -11527,29 +12690,57 @@ yy785:
 	}
 yy786:
 	YYDEBUG(786, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
 		if(yych <= '/'){
+<<<<<<< parse_date.c
+			if(yych >= '/')	goto yy839;
+			goto yy786;
+=======
 			if(yych >= '/')	goto yy840;
 			goto yy787;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '9')	goto yy788;
+			if(yych >= 'n')	goto yy836;
+			goto yy786;
+=======
 			if(yych <= '9')	goto yy789;
 			if(yych >= 'n')	goto yy837;
 			goto yy787;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych >= 'r')	goto yy837;
+			goto yy786;
+=======
 			if(yych >= 'r')	goto yy838;
 			goto yy787;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy835;
+			if(yych <= 't')	goto yy838;
+			goto yy786;
+=======
 			if(yych <= 's')	goto yy836;
 			if(yych <= 't')	goto yy839;
 			goto yy787;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy786:
+	YYDEBUG(786, *YYCURSOR);
+=======
 yy787:
 	YYDEBUG(787, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1033 "ext/date/lib/parse_date.re"
 {
@@ -11565,121 +12756,267 @@ yy787:
 		TIMELIB_DEINIT;
 		return TIMELIB_AMERICAN;
 	}
+<<<<<<< parse_date.c
+#line 10308 "ext/date/lib/parse_date.c"
+yy787:
+	YYDEBUG(787, *YYCURSOR);
+=======
 #line 9976 "ext/date/lib/parse_date.c"
 yy788:
 	YYDEBUG(788, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
 		if(yych <= '/'){
+<<<<<<< parse_date.c
+			if(yych <= '.')	goto yy786;
+			goto yy839;
+		} else {
+			if(yych <= '1')	goto yy788;
+			if(yych <= 'm')	goto yy786;
+			goto yy836;
+=======
 			if(yych <= '.')	goto yy787;
 			goto yy840;
 		} else {
 			if(yych <= '1')	goto yy789;
 			if(yych <= 'm')	goto yy787;
 			goto yy837;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'q')	goto yy786;
+			goto yy837;
+=======
 			if(yych <= 'q')	goto yy787;
 			goto yy838;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy835;
+			if(yych <= 't')	goto yy838;
+			goto yy786;
+=======
 			if(yych <= 's')	goto yy836;
 			if(yych <= 't')	goto yy839;
 			goto yy787;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy788:
+	YYDEBUG(788, *YYCURSOR);
+=======
 yy789:
 	YYDEBUG(789, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych == '/')	goto yy839;
+		if(yych <= 'm')	goto yy786;
+		goto yy836;
+=======
 		if(yych == '/')	goto yy840;
 		if(yych <= 'm')	goto yy787;
 		goto yy837;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'q')	goto yy786;
+			goto yy837;
+=======
 			if(yych <= 'q')	goto yy787;
 			goto yy838;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy835;
+			if(yych <= 't')	goto yy838;
+			goto yy786;
+=======
 			if(yych <= 's')	goto yy836;
 			if(yych <= 't')	goto yy839;
 			goto yy787;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy789:
+	YYDEBUG(789, *YYCURSOR);
+=======
 yy790:
 	YYDEBUG(790, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
+<<<<<<< parse_date.c
+		if(yych == 'A')	goto yy834;
+=======
 		if(yych == 'A')	goto yy835;
+>>>>>>> 1.55
 		if(yych <= 'T')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy833;
+=======
 		goto yy834;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'a'){
 			if(yych <= '`')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy834;
+=======
 			goto yy835;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'u')	goto yy833;
+=======
 			if(yych == 'u')	goto yy834;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy790:
+	YYDEBUG(790, *YYCURSOR);
+=======
 yy791:
 	YYDEBUG(791, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy832;
+	if(yych == 'e')	goto yy832;
+=======
 	if(yych == 'E')	goto yy833;
 	if(yych == 'e')	goto yy833;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy791:
+	YYDEBUG(791, *YYCURSOR);
+=======
 yy792:
 	YYDEBUG(792, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy831;
+	if(yych == 'a')	goto yy831;
+=======
 	if(yych == 'A')	goto yy832;
 	if(yych == 'a')	goto yy832;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy792:
+	YYDEBUG(792, *YYCURSOR);
+=======
 yy793:
 	YYDEBUG(793, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
+<<<<<<< parse_date.c
+		if(yych == 'P')	goto yy830;
+=======
 		if(yych == 'P')	goto yy831;
+>>>>>>> 1.55
 		if(yych <= 'T')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy829;
+=======
 		goto yy830;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'p'){
 			if(yych <= 'o')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy830;
+=======
 			goto yy831;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'u')	goto yy829;
+=======
 			if(yych == 'u')	goto yy830;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy793:
+	YYDEBUG(793, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'E')	goto yy827;
+	if(yych == 'e')	goto yy827;
+	goto yy53;
+=======
+>>>>>>> 1.55
 yy794:
 	YYDEBUG(794, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'C')	goto yy826;
+	if(yych == 'c')	goto yy826;
+	goto yy53;
+=======
 	if(yych == 'E')	goto yy828;
 	if(yych == 'e')	goto yy828;
 	goto yy53;
+>>>>>>> 1.55
 yy795:
 	YYDEBUG(795, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'O')	goto yy825;
+	if(yych == 'o')	goto yy825;
+	goto yy53;
+=======
 	if(yych == 'C')	goto yy827;
 	if(yych == 'c')	goto yy827;
 	goto yy53;
+>>>>>>> 1.55
 yy796:
 	YYDEBUG(796, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy797;
+	if(yych != 'e')	goto yy53;
+	goto yy797;
+=======
 	if(yych == 'O')	goto yy826;
 	if(yych == 'o')	goto yy826;
 	goto yy53;
+>>>>>>> 1.55
 yy797:
 	YYDEBUG(797, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'C')	goto yy798;
+	if(yych != 'c')	goto yy53;
+=======
 	if(yych == 'E')	goto yy798;
 	if(yych != 'e')	goto yy53;
+>>>>>>> 1.55
 	goto yy798;
 yy798:
 	YYDEBUG(798, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != '/')	goto yy53;
+=======
 	if(yych == 'C')	goto yy799;
 	if(yych != 'c')	goto yy53;
+>>>>>>> 1.55
 	goto yy799;
 yy799:
 	YYDEBUG(799, *YYCURSOR);
@@ -11707,64 +13044,128 @@ yy802:
 yy803:
 	YYDEBUG(803, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != ':')	goto yy53;
+	goto yy804;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych >= ':')	goto yy53;
 	goto yy804;
+>>>>>>> 1.55
 yy804:
 	YYDEBUG(804, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '1')	goto yy805;
+	if(yych <= '2')	goto yy806;
+	goto yy53;
+=======
 	if(yych != ':')	goto yy53;
 	goto yy805;
+>>>>>>> 1.55
 yy805:
 	YYDEBUG(805, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy807;
+	goto yy53;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '1')	goto yy806;
 	if(yych <= '2')	goto yy807;
 	goto yy53;
+>>>>>>> 1.55
 yy806:
 	YYDEBUG(806, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych >= '4')	goto yy53;
+	goto yy807;
+=======
 	if(yych <= '9')	goto yy808;
 	goto yy53;
+>>>>>>> 1.55
 yy807:
 	YYDEBUG(807, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != ':')	goto yy53;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych >= '4')	goto yy53;
+>>>>>>> 1.55
 	goto yy808;
 yy808:
 	YYDEBUG(808, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if(yych != ':')	goto yy53;
+	if(yych <= '/')	goto yy53;
+	if(yych >= '6')	goto yy53;
 	goto yy809;
 yy809:
 	YYDEBUG(809, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych >= ':')	goto yy53;
+	goto yy810;
+=======
 	if(yych >= '6')	goto yy53;
 	goto yy810;
+>>>>>>> 1.55
 yy810:
 	YYDEBUG(810, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != ':')	goto yy53;
+	goto yy811;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych >= ':')	goto yy53;
 	goto yy811;
+>>>>>>> 1.55
 yy811:
 	YYDEBUG(811, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy812;
+	if(yych <= '6')	goto yy813;
+	goto yy53;
+=======
 	if(yych != ':')	goto yy53;
 	goto yy812;
+>>>>>>> 1.55
 yy812:
 	YYDEBUG(812, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy814;
+	goto yy53;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '5')	goto yy813;
 	if(yych <= '6')	goto yy814;
 	goto yy53;
+>>>>>>> 1.55
 yy813:
 	YYDEBUG(813, *YYCURSOR);
+<<<<<<< parse_date.c
+	yych = *++YYCURSOR;
+	if(yych != '0')	goto yy53;
+	goto yy814;
+yy814:
+	YYDEBUG(814, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 0x09)	goto yy815;
+	if(yych != ' ')	goto yy53;
+	goto yy815;
+yy815:
+	YYDEBUG(815, *YYCURSOR);
+=======
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
 	if(yych <= '9')	goto yy815;
@@ -11781,37 +13182,83 @@ yy815:
 	goto yy816;
 yy816:
 	YYDEBUG(816, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
 	yych = *YYCURSOR;
+<<<<<<< parse_date.c
+	goto yy816;
+yy816:
+	YYDEBUG(816, *YYCURSOR);
+	if(yych <= ' '){
+		if(yych == 0x09)	goto yy815;
+		if(yych <= 0x1F)	goto yy53;
+		goto yy815;
+=======
 	goto yy817;
 yy817:
 	YYDEBUG(817, *YYCURSOR);
 	if(yych <= '*'){
 		if(yych == ' ')	goto yy816;
 		goto yy53;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= '+'){
+			if(yych <= '*')	goto yy53;
+			goto yy817;
+		} else {
+			if(yych != '-')	goto yy53;
+			goto yy817;
+		}
+=======
 		if(yych == ',')	goto yy53;
 		if(yych >= '.')	goto yy53;
 		goto yy818;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy817:
+	YYDEBUG(817, *YYCURSOR);
+=======
 yy818:
 	YYDEBUG(818, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '1')	goto yy818;
+	if(yych <= '2')	goto yy820;
+	if(yych <= '9')	goto yy821;
+=======
 	if(yych <= '1')	goto yy819;
 	if(yych <= '2')	goto yy821;
 	if(yych <= '9')	goto yy822;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy818:
+	YYDEBUG(818, *YYCURSOR);
+=======
 yy819:
 	YYDEBUG(819, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
+<<<<<<< parse_date.c
+	if((yych = *YYCURSOR) <= '/')	goto yy819;
+	if(yych <= '9')	goto yy821;
+	if(yych <= ':')	goto yy822;
+	goto yy819;
+yy819:
+	YYDEBUG(819, *YYCURSOR);
+=======
 	if((yych = *YYCURSOR) <= '/')	goto yy820;
 	if(yych <= '9')	goto yy822;
 	if(yych <= ':')	goto yy823;
 	goto yy820;
 yy820:
 	YYDEBUG(820, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1264 "ext/date/lib/parse_date.re"
 {
@@ -11831,11 +13278,26 @@ yy820:
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
+<<<<<<< parse_date.c
+#line 10514 "ext/date/lib/parse_date.c"
+yy820:
+	YYDEBUG(820, *YYCURSOR);
+=======
 #line 10176 "ext/date/lib/parse_date.c"
 yy821:
 	YYDEBUG(821, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '5'){
+<<<<<<< parse_date.c
+		if(yych <= '/')	goto yy819;
+		if(yych >= '4')	goto yy823;
+		goto yy821;
+	} else {
+		if(yych <= '9')	goto yy824;
+		if(yych <= ':')	goto yy822;
+		goto yy819;
+=======
 		if(yych <= '/')	goto yy820;
 		if(yych >= '4')	goto yy824;
 		goto yy822;
@@ -11843,35 +13305,77 @@ yy821:
 		if(yych <= '9')	goto yy825;
 		if(yych <= ':')	goto yy823;
 		goto yy820;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy821:
+	YYDEBUG(821, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy819;
+	if(yych <= '5')	goto yy823;
+	if(yych <= '9')	goto yy824;
+	if(yych >= ';')	goto yy819;
+	goto yy822;
+=======
+>>>>>>> 1.55
 yy822:
 	YYDEBUG(822, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy819;
+	if(yych <= '5')	goto yy823;
+	if(yych <= '9')	goto yy824;
+	goto yy819;
+=======
 	if(yych <= '/')	goto yy820;
 	if(yych <= '5')	goto yy824;
 	if(yych <= '9')	goto yy825;
 	if(yych >= ';')	goto yy820;
 	goto yy823;
+>>>>>>> 1.55
 yy823:
 	YYDEBUG(823, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy819;
+	if(yych >= ':')	goto yy819;
+	goto yy824;
+=======
 	if(yych <= '/')	goto yy820;
 	if(yych <= '5')	goto yy824;
 	if(yych <= '9')	goto yy825;
 	goto yy820;
+>>>>>>> 1.55
 yy824:
 	YYDEBUG(824, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	goto yy819;
+=======
 	if(yych <= '/')	goto yy820;
 	if(yych >= ':')	goto yy820;
 	goto yy825;
+>>>>>>> 1.55
 yy825:
 	YYDEBUG(825, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'V')	goto yy798;
+	if(yych == 'v')	goto yy798;
+	goto yy53;
+=======
 	goto yy820;
+>>>>>>> 1.55
 yy826:
 	YYDEBUG(826, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'T')	goto yy798;
+	if(yych == 't')	goto yy798;
+	goto yy53;
+yy827:
+	YYDEBUG(827, *YYCURSOR);
+=======
 	if(yych == 'V')	goto yy799;
 	if(yych == 'v')	goto yy799;
 	goto yy53;
@@ -11900,124 +13404,297 @@ yy829:
 	}
 yy830:
 	YYDEBUG(830, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'P')	goto yy828;
+	if(yych != 'p')	goto yy53;
+	goto yy828;
+yy828:
+	YYDEBUG(828, *YYCURSOR);
+=======
 	if(yych == 'G')	goto yy799;
 	if(yych == 'g')	goto yy799;
 	goto yy53;
 yy831:
 	YYDEBUG(831, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= 'S'){
+		if(yych == '/')	goto yy799;
+		goto yy53;
+	} else {
+		if(yych <= 'T')	goto yy798;
+		if(yych == 't')	goto yy798;
+		goto yy53;
+	}
+yy829:
+	YYDEBUG(829, *YYCURSOR);
+=======
 	if(yych == 'R')	goto yy799;
 	if(yych == 'r')	goto yy799;
 	goto yy53;
 yy832:
 	YYDEBUG(832, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+	if(yych == 'G')	goto yy798;
+	if(yych == 'g')	goto yy798;
+	goto yy53;
+yy830:
+	YYDEBUG(830, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy798;
+	if(yych == 'r')	goto yy798;
+	goto yy53;
+yy831:
+	YYDEBUG(831, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'Y'){
+<<<<<<< parse_date.c
+		if(yych == 'R')	goto yy798;
+=======
 		if(yych == 'R')	goto yy799;
+>>>>>>> 1.55
 		if(yych <= 'X')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy798;
+=======
 		goto yy799;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
 			if(yych <= 'q')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy798;
+=======
 			goto yy799;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'y')	goto yy798;
+=======
 			if(yych == 'y')	goto yy799;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy832:
+	YYDEBUG(832, *YYCURSOR);
+=======
 yy833:
 	YYDEBUG(833, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy798;
+	if(yych == 'b')	goto yy798;
+=======
 	if(yych == 'B')	goto yy799;
 	if(yych == 'b')	goto yy799;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy833:
+	YYDEBUG(833, *YYCURSOR);
+=======
 yy834:
 	YYDEBUG(834, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
+<<<<<<< parse_date.c
+		if(yych == 'L')	goto yy798;
+=======
 		if(yych == 'L')	goto yy799;
+>>>>>>> 1.55
 		if(yych <= 'M')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy798;
+=======
 		goto yy799;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'l'){
 			if(yych <= 'k')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy798;
+=======
 			goto yy799;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'n')	goto yy798;
+=======
 			if(yych == 'n')	goto yy799;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy834:
+	YYDEBUG(834, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'N')	goto yy798;
+	if(yych == 'n')	goto yy798;
+	goto yy53;
+=======
+>>>>>>> 1.55
 yy835:
 	YYDEBUG(835, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 't')	goto yy844;
+=======
 	if(yych == 'N')	goto yy799;
 	if(yych == 'n')	goto yy799;
+>>>>>>> 1.55
 	goto yy53;
 yy836:
 	YYDEBUG(836, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'd')	goto yy844;
+=======
 	if(yych == 't')	goto yy845;
+>>>>>>> 1.55
 	goto yy53;
 yy837:
 	YYDEBUG(837, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'd')	goto yy844;
+	goto yy53;
+=======
 	if(yych == 'd')	goto yy845;
 	goto yy53;
+>>>>>>> 1.55
 yy838:
 	YYDEBUG(838, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'h')	goto yy844;
+	goto yy53;
+=======
 	if(yych == 'd')	goto yy845;
 	goto yy53;
+>>>>>>> 1.55
 yy839:
 	YYDEBUG(839, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych >= ':')	goto yy53;
+	goto yy840;
+=======
 	if(yych == 'h')	goto yy845;
 	goto yy53;
+>>>>>>> 1.55
 yy840:
 	YYDEBUG(840, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy786;
+	if(yych >= ':')	goto yy786;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych >= ':')	goto yy53;
+>>>>>>> 1.55
 	goto yy841;
 yy841:
 	YYDEBUG(841, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy786;
+	if(yych >= ':')	goto yy786;
+	goto yy842;
+=======
 	if(yych <= '/')	goto yy787;
 	if(yych >= ':')	goto yy787;
 	goto yy842;
+>>>>>>> 1.55
 yy842:
 	YYDEBUG(842, *YYCURSOR);
+<<<<<<< parse_date.c
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy786;
+	if(yych >= ':')	goto yy786;
+	goto yy843;
+=======
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy787;
 	if(yych >= ':')	goto yy787;
 	goto yy843;
+>>>>>>> 1.55
 yy843:
 	YYDEBUG(843, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	goto yy786;
+=======
 	if(yych <= '/')	goto yy787;
 	if(yych >= ':')	goto yy787;
 	goto yy844;
+>>>>>>> 1.55
 yy844:
 	YYDEBUG(844, *YYCURSOR);
+<<<<<<< parse_date.c
+	yyaccept = 13;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == '/')	goto yy839;
+	goto yy786;
+=======
 	yych = *++YYCURSOR;
 	goto yy787;
+>>>>>>> 1.55
 yy845:
 	YYDEBUG(845, *YYCURSOR);
+<<<<<<< parse_date.c
+	yych = *++YYCURSOR;
+	if(yych <= '-')	goto yy619;
+	if(yych <= '.')	goto yy847;
+	if(yych >= '0')	goto yy619;
+	goto yy846;
+=======
 	yyaccept = 13;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych == '/')	goto yy840;
 	goto yy787;
+>>>>>>> 1.55
 yy846:
 	YYDEBUG(846, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	YYDEBUG(-1, yych);
+	switch(yych){
+	case 'A':	case 'a':	goto yy792;
+	case 'D':	case 'd':	goto yy796;
+	case 'F':	case 'f':	goto yy790;
+	case 'J':	case 'j':	goto yy789;
+	case 'M':	case 'm':	goto yy791;
+	case 'N':	case 'n':	goto yy795;
+	case 'O':	case 'o':	goto yy794;
+	case 'S':	case 's':	goto yy793;
+	default:	goto yy53;
+	}
+=======
 	if(yych <= ',')	goto yy617;
 	if(yych <= '.')	goto yy848;
 	if(yych >= '0')	goto yy617;
 	goto yy847;
+>>>>>>> 1.55
 yy847:
 	YYDEBUG(847, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy619;
+	if(yych <= '0')	goto yy848;
+	if(yych <= '1')	goto yy849;
+	if(yych <= '9')	goto yy850;
+	goto yy619;
+=======
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case 'A':	case 'a':	goto yy793;
@@ -12030,38 +13707,81 @@ yy847:
 	case 'S':	case 's':	goto yy794;
 	default:	goto yy53;
 	}
+>>>>>>> 1.55
 yy848:
 	YYDEBUG(848, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == '.')	goto yy851;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy850;
+	goto yy53;
+=======
 	if(yych <= '/')	goto yy617;
 	if(yych <= '0')	goto yy849;
 	if(yych <= '1')	goto yy850;
 	if(yych <= '9')	goto yy851;
 	goto yy617;
+>>>>>>> 1.55
 yy849:
 	YYDEBUG(849, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == '.')	goto yy851;
+=======
 	if(yych <= ',')	goto yy53;
 	if(yych <= '.')	goto yy724;
+>>>>>>> 1.55
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych >= '3')	goto yy53;
+	goto yy850;
+=======
 	if(yych <= '9')	goto yy851;
 	goto yy53;
+>>>>>>> 1.55
 yy850:
 	YYDEBUG(850, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != '.')	goto yy53;
+	goto yy851;
+=======
 	if(yych <= ',')	goto yy53;
 	if(yych <= '.')	goto yy724;
 	if(yych <= '/')	goto yy53;
 	if(yych >= '3')	goto yy53;
 	goto yy851;
+>>>>>>> 1.55
 yy851:
 	YYDEBUG(851, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych >= ':')	goto yy53;
+	goto yy852;
+yy852:
+	YYDEBUG(852, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy731;
+	if(yych <= '9')	goto yy730;
+	goto yy731;
+yy853:
+	YYDEBUG(853, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == '-')	goto yy854;
+	if(yych <= '/')	goto yy57;
+	if(yych <= '9')	goto yy881;
+	goto yy57;
+yy854:
+	YYDEBUG(854, *YYCURSOR);
+=======
 	if(yych <= ',')	goto yy53;
 	if(yych <= '.')	goto yy724;
 	goto yy53;
 yy852:
 	YYDEBUG(852, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych == '-')	goto yy853;
 	if(yych <= '/')	goto yy57;
@@ -12072,8 +13792,13 @@ yy853:
 	yych = *++YYCURSOR;
 	YYDEBUG(-1, yych);
 	switch(yych){
+<<<<<<< parse_date.c
+	case '0':	goto yy736;
+	case '1':	goto yy737;
+=======
 	case '0':	goto yy862;
 	case '1':	goto yy863;
+>>>>>>> 1.55
 	case '2':
 	case '3':
 	case '4':
@@ -12081,6 +13806,17 @@ yy853:
 	case '6':
 	case '7':
 	case '8':
+<<<<<<< parse_date.c
+	case '9':	goto yy738;
+	case 'A':	case 'a':	goto yy858;
+	case 'D':	case 'd':	goto yy862;
+	case 'F':	case 'f':	goto yy856;
+	case 'J':	case 'j':	goto yy855;
+	case 'M':	case 'm':	goto yy857;
+	case 'N':	case 'n':	goto yy861;
+	case 'O':	case 'o':	goto yy860;
+	case 'S':	case 's':	goto yy859;
+=======
 	case '9':	goto yy864;
 	case 'A':	case 'a':	goto yy857;
 	case 'D':	case 'd':	goto yy861;
@@ -12090,32 +13826,70 @@ yy853:
 	case 'N':	case 'n':	goto yy860;
 	case 'O':	case 'o':	goto yy859;
 	case 'S':	case 's':	goto yy858;
+>>>>>>> 1.55
 	default:	goto yy53;
 	}
+<<<<<<< parse_date.c
+yy855:
+	YYDEBUG(855, *YYCURSOR);
+=======
 yy854:
 	YYDEBUG(854, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
+<<<<<<< parse_date.c
+		if(yych == 'A')	goto yy880;
+=======
 		if(yych == 'A')	goto yy886;
+>>>>>>> 1.55
 		if(yych <= 'T')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy879;
+=======
 		goto yy885;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'a'){
 			if(yych <= '`')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy880;
+=======
 			goto yy886;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'u')	goto yy879;
+=======
 			if(yych == 'u')	goto yy885;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy856:
+	YYDEBUG(856, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'E')	goto yy878;
+	if(yych == 'e')	goto yy878;
+	goto yy53;
+yy857:
+	YYDEBUG(857, *YYCURSOR);
+=======
 yy855:
 	YYDEBUG(855, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy877;
+	if(yych == 'a')	goto yy877;
+=======
 	if(yych == 'E')	goto yy884;
 	if(yych == 'e')	goto yy884;
+>>>>>>> 1.55
 	goto yy53;
-yy856:
-	YYDEBUG(856, *YYCURSOR);
+yy858:
+	YYDEBUG(858, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych == 'A')	goto yy883;
 	if(yych == 'a')	goto yy883;
@@ -12124,56 +13898,104 @@ yy857:
 	YYDEBUG(857, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
+<<<<<<< parse_date.c
+		if(yych == 'P')	goto yy876;
+=======
 		if(yych == 'P')	goto yy882;
+>>>>>>> 1.55
 		if(yych <= 'T')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy875;
+=======
 		goto yy881;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'p'){
 			if(yych <= 'o')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy876;
+=======
 			goto yy882;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'u')	goto yy875;
+=======
 			if(yych == 'u')	goto yy881;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+=======
 yy858:
 	YYDEBUG(858, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych == 'E')	goto yy879;
 	if(yych == 'e')	goto yy879;
 	goto yy53;
+>>>>>>> 1.55
 yy859:
 	YYDEBUG(859, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy873;
+	if(yych == 'e')	goto yy873;
+=======
 	if(yych == 'C')	goto yy878;
 	if(yych == 'c')	goto yy878;
+>>>>>>> 1.55
 	goto yy53;
 yy860:
 	YYDEBUG(860, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'C')	goto yy872;
+	if(yych == 'c')	goto yy872;
+	goto yy53;
+=======
 	if(yych == 'O')	goto yy877;
 	if(yych == 'o')	goto yy877;
 	goto yy53;
+>>>>>>> 1.55
 yy861:
 	YYDEBUG(861, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'O')	goto yy871;
+	if(yych == 'o')	goto yy871;
+	goto yy53;
+=======
 	if(yych == 'E')	goto yy869;
 	if(yych == 'e')	goto yy869;
 	goto yy53;
+>>>>>>> 1.55
 yy862:
 	YYDEBUG(862, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy863;
+	if(yych != 'e')	goto yy53;
+	goto yy863;
+=======
 	if(yych == '-')	goto yy865;
 	if(yych <= '/')	goto yy53;
 	if(yych <= '9')	goto yy864;
 	goto yy53;
+>>>>>>> 1.55
 yy863:
 	YYDEBUG(863, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'C')	goto yy864;
+	if(yych != 'c')	goto yy53;
+	goto yy864;
+=======
 	if(yych == '-')	goto yy865;
 	if(yych <= '/')	goto yy53;
 	if(yych >= '3')	goto yy53;
 	goto yy864;
+>>>>>>> 1.55
 yy864:
 	YYDEBUG(864, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -12183,9 +14005,15 @@ yy865:
 	YYDEBUG(865, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '0')	goto yy866;
+	if(yych <= '2')	goto yy867;
+	if(yych <= '3')	goto yy868;
+=======
 	if(yych <= '2')	goto yy866;
 	if(yych <= '3')	goto yy867;
 	if(yych <= '9')	goto yy868;
+>>>>>>> 1.55
 	goto yy53;
 yy866:
 	YYDEBUG(866, *YYCURSOR);
@@ -12272,6 +14100,29 @@ yy873:
 yy874:
 	YYDEBUG(874, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '0')	goto yy53;
+	if(yych <= '9')	goto yy869;
+	goto yy53;
+yy867:
+	YYDEBUG(867, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy869;
+	goto yy53;
+yy868:
+	YYDEBUG(868, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych >= '2')	goto yy53;
+	goto yy869;
+yy869:
+	YYDEBUG(869, *YYCURSOR);
+	++YYCURSOR;
+	goto yy870;
+yy870:
+	YYDEBUG(870, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych >= '2')	goto yy53;
 	goto yy875;
@@ -12281,6 +14132,7 @@ yy875:
 	goto yy876;
 yy876:
 	YYDEBUG(876, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1251 "ext/date/lib/parse_date.re"
 {
@@ -12294,99 +14146,232 @@ yy876:
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_TEXT;
 	}
+<<<<<<< parse_date.c
+#line 10804 "ext/date/lib/parse_date.c"
+yy871:
+	YYDEBUG(871, *YYCURSOR);
+=======
 #line 10525 "ext/date/lib/parse_date.c"
 yy877:
 	YYDEBUG(877, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'V')	goto yy864;
+	if(yych == 'v')	goto yy864;
+=======
 	if(yych == 'V')	goto yy870;
 	if(yych == 'v')	goto yy870;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy872:
+	YYDEBUG(872, *YYCURSOR);
+=======
 yy878:
 	YYDEBUG(878, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'T')	goto yy864;
+	if(yych == 't')	goto yy864;
+=======
 	if(yych == 'T')	goto yy870;
 	if(yych == 't')	goto yy870;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy873:
+	YYDEBUG(873, *YYCURSOR);
+=======
 yy879:
 	YYDEBUG(879, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'P')	goto yy874;
+=======
 	if(yych == 'P')	goto yy880;
+>>>>>>> 1.55
 	if(yych != 'p')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy874;
+yy874:
+	YYDEBUG(874, *YYCURSOR);
+=======
 	goto yy880;
 yy880:
 	YYDEBUG(880, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'S'){
+<<<<<<< parse_date.c
+		if(yych == '-')	goto yy865;
+=======
 		if(yych == '-')	goto yy871;
+>>>>>>> 1.55
 		goto yy53;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'T')	goto yy864;
+		if(yych == 't')	goto yy864;
+=======
 		if(yych <= 'T')	goto yy870;
 		if(yych == 't')	goto yy870;
+>>>>>>> 1.55
 		goto yy53;
 	}
+<<<<<<< parse_date.c
+yy875:
+	YYDEBUG(875, *YYCURSOR);
+=======
 yy881:
 	YYDEBUG(881, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'G')	goto yy864;
+	if(yych == 'g')	goto yy864;
+=======
 	if(yych == 'G')	goto yy870;
 	if(yych == 'g')	goto yy870;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy876:
+	YYDEBUG(876, *YYCURSOR);
+=======
 yy882:
 	YYDEBUG(882, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'R')	goto yy864;
+	if(yych == 'r')	goto yy864;
+=======
 	if(yych == 'R')	goto yy870;
 	if(yych == 'r')	goto yy870;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy877:
+	YYDEBUG(877, *YYCURSOR);
+=======
 yy883:
 	YYDEBUG(883, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'Y'){
+<<<<<<< parse_date.c
+		if(yych == 'R')	goto yy864;
+=======
 		if(yych == 'R')	goto yy870;
+>>>>>>> 1.55
 		if(yych <= 'X')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy864;
+=======
 		goto yy870;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
 			if(yych <= 'q')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy864;
+=======
 			goto yy870;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'y')	goto yy864;
+=======
 			if(yych == 'y')	goto yy870;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy878:
+	YYDEBUG(878, *YYCURSOR);
+=======
 yy884:
 	YYDEBUG(884, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy864;
+	if(yych == 'b')	goto yy864;
+=======
 	if(yych == 'B')	goto yy870;
 	if(yych == 'b')	goto yy870;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy879:
+	YYDEBUG(879, *YYCURSOR);
+=======
 yy885:
 	YYDEBUG(885, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
+<<<<<<< parse_date.c
+		if(yych == 'L')	goto yy864;
+=======
 		if(yych == 'L')	goto yy870;
+>>>>>>> 1.55
 		if(yych <= 'M')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy864;
+=======
 		goto yy870;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'l'){
 			if(yych <= 'k')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy864;
+=======
 			goto yy870;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'n')	goto yy864;
+=======
 			if(yych == 'n')	goto yy870;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy880:
+	YYDEBUG(880, *YYCURSOR);
+=======
 yy886:
 	YYDEBUG(886, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'N')	goto yy864;
+	if(yych == 'n')	goto yy864;
+=======
 	if(yych == 'N')	goto yy870;
 	if(yych == 'n')	goto yy870;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy881:
+	YYDEBUG(881, *YYCURSOR);
+=======
 yy887:
 	YYDEBUG(887, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 14;
 	yych = *(YYMARKER = ++YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':
+	case 0x09:	goto yy56;
+	case ' ':	goto yy885;
 	case '!':
 	case '"':
 	case '#':
@@ -12398,6 +14383,16 @@ yy887:
 	case ')':
 	case '*':
 	case '+':
+<<<<<<< parse_date.c
+	case ',':	goto yy887;
+	case '-':	goto yy883;
+	case '.':	goto yy889;
+	case '/':	goto yy884;
+	case '0':	goto yy902;
+	case '1':	goto yy903;
+	case '2':	goto yy904;
+	case '3':	goto yy905;
+=======
 	case ',':	case 'A':	case 'D':	case 'F':	case 'H':
 	case 'I':
 	case 'J':	case 'M':
@@ -12415,18 +14410,44 @@ yy887:
 	case '1':	goto yy909;
 	case '2':	goto yy911;
 	case '3':	goto yy912;
+>>>>>>> 1.55
 	case '4':
 	case '5':
 	case '6':
 	case '7':
 	case '8':
 	case '9':	goto yy51;
+<<<<<<< parse_date.c
+	case 'A':	case 'a':	goto yy897;
+	case 'D':	case 'd':	goto yy901;
+	case 'F':	case 'f':	goto yy895;
+	case 'H':	case 'h':	goto yy60;
+	case 'I':	goto yy890;
+	case 'J':	case 'j':	goto yy894;
+	case 'M':	case 'm':	goto yy896;
+	case 'N':	case 'n':	goto yy900;
+	case 'O':	case 'o':	goto yy899;
+	case 'S':	case 's':	goto yy898;
+	case 'T':	case 't':	goto yy65;
+	case 'V':	goto yy892;
+	case 'W':	goto yy906;
+	case 'X':	goto yy893;
+	case 'Y':	case 'y':	goto yy64;
+	case 'w':	goto yy62;
+	default:	goto yy882;
+=======
 	case ':':	goto yy910;
 	case 'W':	goto yy913;
 	default:	goto yy888;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy882:
+	YYDEBUG(882, *YYCURSOR);
+=======
 yy888:
 	YYDEBUG(888, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1283 "ext/date/lib/parse_date.re"
 {
@@ -12436,14 +14457,25 @@ yy888:
 		TIMELIB_DEINIT;
 		return TIMELIB_CLF;
 	}
+<<<<<<< parse_date.c
+#line 10927 "ext/date/lib/parse_date.c"
+yy883:
+	YYDEBUG(883, *YYCURSOR);
+=======
 #line 10642 "ext/date/lib/parse_date.c"
 yy889:
 	YYDEBUG(889, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	YYDEBUG(-1, yych);
 	switch(yych){
+<<<<<<< parse_date.c
+	case '0':	goto yy1048;
+	case '1':	goto yy1049;
+=======
 	case '0':	goto yy1073;
 	case '1':	goto yy1074;
+>>>>>>> 1.55
 	case '2':
 	case '3':
 	case '4':
@@ -12451,6 +14483,18 @@ yy889:
 	case '6':
 	case '7':
 	case '8':
+<<<<<<< parse_date.c
+	case '9':	goto yy1050;
+	case 'A':	case 'a':	goto yy1043;
+	case 'D':	case 'd':	goto yy1047;
+	case 'F':	case 'f':	goto yy1041;
+	case 'J':	case 'j':	goto yy1040;
+	case 'M':	case 'm':	goto yy1042;
+	case 'N':	case 'n':	goto yy1046;
+	case 'O':	case 'o':	goto yy1045;
+	case 'S':	case 's':	goto yy1044;
+	default:	goto yy888;
+=======
 	case '9':	goto yy1075;
 	case 'A':	case 'a':	goto yy1068;
 	case 'D':	case 'd':	goto yy1072;
@@ -12461,26 +14505,54 @@ yy889:
 	case 'O':	case 'o':	goto yy1070;
 	case 'S':	case 's':	goto yy1069;
 	default:	goto yy894;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy884:
+	YYDEBUG(884, *YYCURSOR);
+=======
 yy890:
 	YYDEBUG(890, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '0')	goto yy1021;
+	if(yych <= '1')	goto yy1022;
+	if(yych <= '9')	goto yy1023;
+=======
 	if(yych <= '0')	goto yy1046;
 	if(yych <= '1')	goto yy1047;
 	if(yych <= '9')	goto yy1048;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy885:
+	YYDEBUG(885, *YYCURSOR);
+=======
 yy891:
 	YYDEBUG(891, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 11) YYFILL(11);
 	yych = *YYCURSOR;
+<<<<<<< parse_date.c
+	goto yy886;
+yy886:
+	YYDEBUG(886, *YYCURSOR);
+=======
 	goto yy892;
 yy892:
 	YYDEBUG(892, *YYCURSOR);
+>>>>>>> 1.55
 	YYDEBUG(-1, yych);
 	switch(yych){
+<<<<<<< parse_date.c
+	case 0x09:	goto yy56;
+	case ' ':	goto yy885;
+=======
 	case ' ':	goto yy891;
+>>>>>>> 1.55
 	case '!':
 	case '"':
 	case '#':
@@ -12494,32 +14566,67 @@ yy892:
 	case '+':
 	case ',':
 	case '-':
+<<<<<<< parse_date.c
+	case '.':	goto yy887;
+	case 'A':	case 'a':	goto yy897;
+	case 'D':	case 'd':	goto yy901;
+	case 'F':	case 'f':	goto yy895;
+=======
 	case '.':	goto yy893;
 	case 'A':	case 'a':	goto yy903;
 	case 'D':	case 'd':	goto yy907;
 	case 'F':	case 'f':	goto yy901;
+>>>>>>> 1.55
 	case 'H':	case 'h':	goto yy60;
+<<<<<<< parse_date.c
+	case 'I':	goto yy890;
+	case 'J':	case 'j':	goto yy894;
+	case 'M':	case 'm':	goto yy896;
+	case 'N':	case 'n':	goto yy900;
+	case 'O':	case 'o':	goto yy899;
+	case 'S':	case 's':	goto yy898;
+=======
 	case 'I':	goto yy896;
 	case 'J':	case 'j':	goto yy900;
 	case 'M':	case 'm':	goto yy902;
 	case 'N':	case 'n':	goto yy906;
 	case 'O':	case 'o':	goto yy905;
 	case 'S':	case 's':	goto yy904;
+>>>>>>> 1.55
 	case 'T':	case 't':	goto yy65;
+<<<<<<< parse_date.c
+	case 'V':	goto yy892;
+=======
 	case 'V':	goto yy898;
+>>>>>>> 1.55
 	case 'W':	case 'w':	goto yy62;
+<<<<<<< parse_date.c
+	case 'X':	goto yy893;
+=======
 	case 'X':	goto yy899;
+>>>>>>> 1.55
 	case 'Y':	case 'y':	goto yy64;
 	default:	goto yy53;
 	}
+<<<<<<< parse_date.c
+yy887:
+	YYDEBUG(887, *YYCURSOR);
+=======
 yy893:
 	YYDEBUG(893, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 9) YYFILL(9);
 	yych = *YYCURSOR;
+<<<<<<< parse_date.c
+	goto yy888;
+yy888:
+	YYDEBUG(888, *YYCURSOR);
+=======
 	goto yy894;
 yy894:
 	YYDEBUG(894, *YYCURSOR);
+>>>>>>> 1.55
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case ' ':
@@ -12536,6 +14643,20 @@ yy894:
 	case '+':
 	case ',':
 	case '-':
+<<<<<<< parse_date.c
+	case '.':	goto yy887;
+	case 'A':	case 'a':	goto yy897;
+	case 'D':	case 'd':	goto yy1013;
+	case 'F':	case 'f':	goto yy1010;
+	case 'I':	goto yy890;
+	case 'J':	case 'j':	goto yy894;
+	case 'M':	case 'm':	goto yy1011;
+	case 'N':	case 'n':	goto yy900;
+	case 'O':	case 'o':	goto yy899;
+	case 'S':	case 's':	goto yy1012;
+	case 'V':	goto yy892;
+	case 'X':	goto yy893;
+=======
 	case '.':	goto yy893;
 	case 'A':	case 'a':	goto yy903;
 	case 'D':	case 'd':	goto yy1038;
@@ -12548,11 +14669,26 @@ yy894:
 	case 'S':	case 's':	goto yy1037;
 	case 'V':	goto yy898;
 	case 'X':	goto yy899;
+>>>>>>> 1.55
 	default:	goto yy53;
 	}
+<<<<<<< parse_date.c
+yy889:
+	YYDEBUG(889, *YYCURSOR);
+=======
 yy895:
 	YYDEBUG(895, *YYCURSOR);
-	yych = *++YYCURSOR;
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy888;
+	if(yych <= '0')	goto yy1007;
+	if(yych <= '2')	goto yy1008;
+	if(yych <= '3')	goto yy1009;
+	goto yy888;
+yy890:
+	YYDEBUG(890, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy894;
 	if(yych <= '0')	goto yy1032;
 	if(yych <= '2')	goto yy1033;
@@ -12560,17 +14696,34 @@ yy895:
 	goto yy894;
 yy896:
 	YYDEBUG(896, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
 	if((yych = *YYCURSOR) <= 'U'){
+<<<<<<< parse_date.c
+		if(yych == 'I')	goto yy1006;
+		goto yy891;
+=======
 		if(yych == 'I')	goto yy1031;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych == 'W')	goto yy891;
+		if(yych <= 'X')	goto yy960;
+		goto yy891;
+=======
 		if(yych == 'W')	goto yy897;
 		if(yych <= 'X')	goto yy985;
 		goto yy897;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy891:
+	YYDEBUG(891, *YYCURSOR);
+=======
 yy897:
 	YYDEBUG(897, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1113 "ext/date/lib/parse_date.re"
 {
@@ -12584,39 +14737,84 @@ yy897:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NO_DAY;
 	}
+<<<<<<< parse_date.c
+#line 11055 "ext/date/lib/parse_date.c"
+yy892:
+	YYDEBUG(892, *YYCURSOR);
+=======
 #line 10769 "ext/date/lib/parse_date.c"
 yy898:
 	YYDEBUG(898, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'I')	goto yy1004;
+	goto yy891;
+yy893:
+	YYDEBUG(893, *YYCURSOR);
+=======
 	if(yych == 'I')	goto yy1029;
 	goto yy897;
 yy899:
 	YYDEBUG(899, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'I')	goto yy1003;
+	goto yy891;
+yy894:
+	YYDEBUG(894, *YYCURSOR);
+=======
 	if(yych == 'I')	goto yy1028;
 	goto yy897;
 yy900:
 	YYDEBUG(900, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
+<<<<<<< parse_date.c
+		if(yych == 'A')	goto yy996;
+=======
 		if(yych == 'A')	goto yy1021;
+>>>>>>> 1.55
 		if(yych <= 'T')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy995;
+=======
 		goto yy1020;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'a'){
 			if(yych <= '`')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy996;
+=======
 			goto yy1021;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'u')	goto yy995;
+=======
 			if(yych == 'u')	goto yy1020;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy895:
+	YYDEBUG(895, *YYCURSOR);
+=======
 yy901:
 	YYDEBUG(901, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'R'){
 		if(yych <= 'N'){
+<<<<<<< parse_date.c
+			if(yych == 'E')	goto yy989;
+=======
 			if(yych == 'E')	goto yy1014;
+>>>>>>> 1.55
 			goto yy53;
 		} else {
 			if(yych <= 'O')	goto yy83;
@@ -12625,7 +14823,11 @@ yy901:
 		}
 	} else {
 		if(yych <= 'n'){
+<<<<<<< parse_date.c
+			if(yych == 'e')	goto yy989;
+=======
 			if(yych == 'e')	goto yy1014;
+>>>>>>> 1.55
 			goto yy53;
 		} else {
 			if(yych <= 'o')	goto yy83;
@@ -12633,12 +14835,21 @@ yy901:
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy896:
+	YYDEBUG(896, *YYCURSOR);
+=======
 yy902:
 	YYDEBUG(902, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'O'){
 		if(yych <= 'H'){
+<<<<<<< parse_date.c
+			if(yych == 'A')	goto yy986;
+=======
 			if(yych == 'A')	goto yy1011;
+>>>>>>> 1.55
 			goto yy53;
 		} else {
 			if(yych <= 'I')	goto yy110;
@@ -12647,7 +14858,11 @@ yy902:
 		}
 	} else {
 		if(yych <= 'h'){
+<<<<<<< parse_date.c
+			if(yych == 'a')	goto yy986;
+=======
 			if(yych == 'a')	goto yy1011;
+>>>>>>> 1.55
 			goto yy53;
 		} else {
 			if(yych <= 'i')	goto yy110;
@@ -12655,31 +14870,61 @@ yy902:
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy897:
+	YYDEBUG(897, *YYCURSOR);
+=======
 yy903:
 	YYDEBUG(903, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
+<<<<<<< parse_date.c
+		if(yych == 'P')	goto yy980;
+=======
 		if(yych == 'P')	goto yy1005;
+>>>>>>> 1.55
 		if(yych <= 'T')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy979;
+=======
 		goto yy1004;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'p'){
 			if(yych <= 'o')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy980;
+=======
 			goto yy1005;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'u')	goto yy979;
+=======
 			if(yych == 'u')	goto yy1004;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy898:
+	YYDEBUG(898, *YYCURSOR);
+=======
 yy904:
 	YYDEBUG(904, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
 		if(yych <= 'D'){
 			if(yych == 'A')	goto yy119;
 			goto yy53;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'E')	goto yy972;
+=======
 			if(yych <= 'E')	goto yy997;
+>>>>>>> 1.55
 			if(yych <= 'T')	goto yy53;
 			goto yy118;
 		}
@@ -12688,53 +14933,115 @@ yy904:
 			if(yych == 'a')	goto yy119;
 			goto yy53;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'e')	goto yy972;
+=======
 			if(yych <= 'e')	goto yy997;
+>>>>>>> 1.55
 			if(yych == 'u')	goto yy118;
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy899:
+	YYDEBUG(899, *YYCURSOR);
+=======
 yy905:
 	YYDEBUG(905, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'C')	goto yy967;
+	if(yych == 'c')	goto yy967;
+=======
 	if(yych == 'C')	goto yy992;
 	if(yych == 'c')	goto yy992;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy900:
+	YYDEBUG(900, *YYCURSOR);
+=======
 yy906:
 	YYDEBUG(906, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'O')	goto yy961;
+	if(yych == 'o')	goto yy961;
+=======
 	if(yych == 'O')	goto yy986;
 	if(yych == 'o')	goto yy986;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy901:
+	YYDEBUG(901, *YYCURSOR);
+	yych = *++YYCURSOR;
+=======
 yy907:
 	YYDEBUG(907, *YYCURSOR);
 	yych = *++YYCURSOR;
+>>>>>>> 1.55
 	if(yych <= 'E'){
 		if(yych == 'A')	goto yy106;
 		if(yych <= 'D')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy954;
+=======
 		goto yy979;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'a'){
 			if(yych <= '`')	goto yy53;
 			goto yy106;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'e')	goto yy954;
+=======
 			if(yych == 'e')	goto yy979;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy902:
+	YYDEBUG(902, *YYCURSOR);
+=======
 yy908:
 	YYDEBUG(908, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '0')	goto yy952;
+	if(yych <= '9')	goto yy953;
+=======
 	if(yych <= '0')	goto yy977;
 	if(yych <= '9')	goto yy978;
+>>>>>>> 1.55
 	goto yy57;
+<<<<<<< parse_date.c
+yy903:
+	YYDEBUG(903, *YYCURSOR);
+=======
 yy909:
 	YYDEBUG(909, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '2')	goto yy919;
+	if(yych <= '9')	goto yy918;
+=======
 	if(yych <= '2')	goto yy946;
 	if(yych <= '9')	goto yy925;
+>>>>>>> 1.55
 	goto yy57;
+<<<<<<< parse_date.c
+yy904:
+	YYDEBUG(904, *YYCURSOR);
+=======
 yy910:
 	YYDEBUG(910, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -12744,26 +15051,52 @@ yy910:
 	goto yy53;
 yy911:
 	YYDEBUG(911, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy918;
+=======
 	if(yych <= '9')	goto yy925;
+>>>>>>> 1.55
 	goto yy57;
+<<<<<<< parse_date.c
+yy905:
+	YYDEBUG(905, *YYCURSOR);
+=======
 yy912:
 	YYDEBUG(912, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '5')	goto yy914;
+	if(yych <= '6')	goto yy915;
+=======
 	if(yych <= '5')	goto yy921;
 	if(yych <= '6')	goto yy922;
+>>>>>>> 1.55
 	if(yych <= '9')	goto yy51;
 	goto yy57;
+<<<<<<< parse_date.c
+yy906:
+	YYDEBUG(906, *YYCURSOR);
+=======
 yy913:
 	YYDEBUG(913, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '5'){
 		if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+		if(yych <= '0')	goto yy907;
+		if(yych <= '4')	goto yy908;
+		goto yy909;
+=======
 		if(yych <= '0')	goto yy914;
 		if(yych <= '4')	goto yy915;
 		goto yy916;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'E'){
 			if(yych <= 'D')	goto yy53;
@@ -12773,32 +15106,69 @@ yy913:
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy907:
+	YYDEBUG(907, *YYCURSOR);
+=======
 yy914:
 	YYDEBUG(914, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '0')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy910;
+=======
 	if(yych <= '9')	goto yy917;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy908:
+	YYDEBUG(908, *YYCURSOR);
+=======
 yy915:
 	YYDEBUG(915, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy910;
+=======
 	if(yych <= '9')	goto yy917;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy909:
+	YYDEBUG(909, *YYCURSOR);
+=======
 yy916:
 	YYDEBUG(916, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
 	if(yych >= '4')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy910;
+yy910:
+	YYDEBUG(910, *YYCURSOR);
+=======
 	goto yy917;
 yy917:
 	YYDEBUG(917, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
+<<<<<<< parse_date.c
+	if((yych = *YYCURSOR) <= '/')	goto yy911;
+	if(yych <= '7')	goto yy912;
+	goto yy911;
+yy911:
+	YYDEBUG(911, *YYCURSOR);
+=======
 	if((yych = *YYCURSOR) <= '/')	goto yy918;
 	if(yych <= '7')	goto yy919;
 	goto yy918;
 yy918:
 	YYDEBUG(918, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1219 "ext/date/lib/parse_date.re"
 {
@@ -12818,13 +15188,25 @@ yy918:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
+<<<<<<< parse_date.c
+#line 11242 "ext/date/lib/parse_date.c"
+yy912:
+	YYDEBUG(912, *YYCURSOR);
+=======
 #line 10961 "ext/date/lib/parse_date.c"
 yy919:
 	YYDEBUG(919, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
+<<<<<<< parse_date.c
+	goto yy913;
+yy913:
+	YYDEBUG(913, *YYCURSOR);
+=======
 	goto yy920;
 yy920:
 	YYDEBUG(920, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1200 "ext/date/lib/parse_date.re"
 {
@@ -12844,27 +15226,69 @@ yy920:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_WEEK;
 	}
+<<<<<<< parse_date.c
+#line 11264 "ext/date/lib/parse_date.c"
+yy914:
+	YYDEBUG(914, *YYCURSOR);
+=======
 #line 10983 "ext/date/lib/parse_date.c"
 yy921:
 	YYDEBUG(921, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy916;
+=======
 	if(yych <= '9')	goto yy923;
+>>>>>>> 1.55
 	goto yy57;
+<<<<<<< parse_date.c
+yy915:
+	YYDEBUG(915, *YYCURSOR);
+=======
 yy922:
 	YYDEBUG(922, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '6')	goto yy916;
+=======
 	if(yych <= '6')	goto yy923;
+>>>>>>> 1.55
 	if(yych <= '9')	goto yy51;
 	goto yy57;
+<<<<<<< parse_date.c
+yy916:
+	YYDEBUG(916, *YYCURSOR);
+=======
 yy923:
 	YYDEBUG(923, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yybm[0+yych] & 8) {
+	if(yybm[0+yych] & 4) {
 		goto yy51;
 	}
+<<<<<<< parse_date.c
+	if(yych <= 'W'){
+		if(yych <= 'F'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych >= ' ')	goto yy57;
+				goto yy917;
+			} else {
+				if(yych == 'D')	goto yy57;
+				if(yych >= 'F')	goto yy57;
+				goto yy917;
+			}
+		} else {
+			if(yych <= 'M'){
+				if(yych == 'H')	goto yy57;
+				if(yych >= 'M')	goto yy57;
+				goto yy917;
+=======
 	if(yych <= 'X'){
 		if(yych <= 'G'){
 			if(yych <= 'C'){
@@ -12880,13 +15304,31 @@ yy923:
 				if(yych <= 'H')	goto yy57;
 				if(yych == 'M')	goto yy57;
 				goto yy924;
+>>>>>>> 1.55
 			} else {
+				if(yych <= 'R')	goto yy917;
 				if(yych <= 'T')	goto yy57;
+<<<<<<< parse_date.c
+				if(yych >= 'W')	goto yy57;
+				goto yy917;
+=======
 				if(yych == 'W')	goto yy57;
 				goto yy924;
+>>>>>>> 1.55
 			}
 		}
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'h'){
+			if(yych <= 'd'){
+				if(yych == 'Y')	goto yy57;
+				if(yych >= 'd')	goto yy57;
+				goto yy917;
+			} else {
+				if(yych == 'f')	goto yy57;
+				if(yych >= 'h')	goto yy57;
+				goto yy917;
+=======
 		if(yych <= 'l'){
 			if(yych <= 'e'){
 				if(yych <= 'Y')	goto yy57;
@@ -12896,8 +15338,23 @@ yy923:
 				if(yych == 'g')	goto yy924;
 				if(yych <= 'h')	goto yy57;
 				goto yy924;
+>>>>>>> 1.55
 			}
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych >= 's')	goto yy57;
+				goto yy917;
+			} else {
+				if(yych <= 'w'){
+					if(yych >= 'w')	goto yy57;
+					goto yy917;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy917;
+				}
+=======
 			if(yych <= 'v'){
 				if(yych <= 'm')	goto yy57;
 				if(yych <= 'r')	goto yy924;
@@ -12907,11 +15364,17 @@ yy923:
 				if(yych == 'x')	goto yy924;
 				if(yych <= 'y')	goto yy57;
 				goto yy924;
+>>>>>>> 1.55
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy917:
+	YYDEBUG(917, *YYCURSOR);
+=======
 yy924:
 	YYDEBUG(924, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1187 "ext/date/lib/parse_date.re"
 {
@@ -12925,13 +15388,27 @@ yy924:
 		TIMELIB_DEINIT;
 		return TIMELIB_PG_YEARDAY;
 	}
+<<<<<<< parse_date.c
+#line 11342 "ext/date/lib/parse_date.c"
+yy918:
+	YYDEBUG(918, *YYCURSOR);
+=======
 #line 11056 "ext/date/lib/parse_date.c"
 yy925:
 	YYDEBUG(925, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy916;
+=======
 	if(yych <= '9')	goto yy923;
+>>>>>>> 1.55
 	goto yy57;
+<<<<<<< parse_date.c
+yy919:
+	YYDEBUG(919, *YYCURSOR);
+=======
 yy926:
 	YYDEBUG(926, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13072,20 +15549,100 @@ yy945:
 #line 11158 "ext/date/lib/parse_date.c"
 yy946:
 	YYDEBUG(946, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '2'){
 		if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+		if(yych >= '1')	goto yy921;
+		goto yy920;
+=======
 		if(yych >= '1')	goto yy948;
 		goto yy947;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= '3')	goto yy922;
+		if(yych <= '9')	goto yy916;
+=======
 		if(yych <= '3')	goto yy949;
 		if(yych <= '9')	goto yy923;
+>>>>>>> 1.55
 		goto yy57;
 	}
+<<<<<<< parse_date.c
+yy920:
+	YYDEBUG(920, *YYCURSOR);
+=======
 yy947:
 	YYDEBUG(947, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy917;
+				goto yy57;
+			} else {
+				if(yych <= '0'){
+					if(yych <= '/')	goto yy917;
+					goto yy51;
+				} else {
+					if(yych <= '9')	goto yy923;
+					if(yych <= 'C')	goto yy917;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy57;
+				if(yych <= 'G')	goto yy917;
+				goto yy57;
+			} else {
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy917;
+					goto yy57;
+				} else {
+					if(yych <= 'R')	goto yy917;
+					if(yych <= 'T')	goto yy57;
+					goto yy917;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy917;
+				if(yych <= 'Y')	goto yy57;
+				goto yy917;
+			} else {
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy57;
+					goto yy917;
+				} else {
+					if(yych == 'g')	goto yy917;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych <= 'r')	goto yy917;
+				goto yy57;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy917;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy917;
+				}
+			}
+		}
+=======
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
@@ -13102,11 +15659,77 @@ yy947:
 	case '8':
 	case '9':	goto yy950;
 	default:	goto yy924;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy921:
+	YYDEBUG(921, *YYCURSOR);
+=======
 yy948:
 	YYDEBUG(948, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy917;
+				goto yy57;
+			} else {
+				if(yych <= '/')	goto yy917;
+				if(yych <= '9')	goto yy923;
+				if(yych <= 'C')	goto yy917;
+				goto yy57;
+			}
+		} else {
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy57;
+				if(yych <= 'G')	goto yy917;
+				goto yy57;
+			} else {
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy917;
+					goto yy57;
+				} else {
+					if(yych <= 'R')	goto yy917;
+					if(yych <= 'T')	goto yy57;
+					goto yy917;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy917;
+				if(yych <= 'Y')	goto yy57;
+				goto yy917;
+			} else {
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy57;
+					goto yy917;
+				} else {
+					if(yych == 'g')	goto yy917;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych <= 'r')	goto yy917;
+				goto yy57;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy917;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy917;
+				}
+			}
+		}
+=======
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
@@ -13123,18 +15746,95 @@ yy948:
 	case '8':
 	case '9':	goto yy950;
 	default:	goto yy924;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy922:
+	YYDEBUG(922, *YYCURSOR);
+=======
 yy949:
 	YYDEBUG(949, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 15;
 	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy917;
+				goto yy57;
+			} else {
+				if(yych <= '1'){
+					if(yych <= '/')	goto yy917;
+					goto yy923;
+				} else {
+					if(yych <= '9')	goto yy51;
+					if(yych <= 'C')	goto yy917;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy57;
+				if(yych <= 'G')	goto yy917;
+				goto yy57;
+			} else {
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy917;
+					goto yy57;
+				} else {
+					if(yych <= 'R')	goto yy917;
+					if(yych <= 'T')	goto yy57;
+					goto yy917;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy917;
+				if(yych <= 'Y')	goto yy57;
+				goto yy917;
+			} else {
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy57;
+					goto yy917;
+				} else {
+					if(yych == 'g')	goto yy917;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych <= 'r')	goto yy917;
+				goto yy57;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy917;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy917;
+				}
+			}
+		}
+	}
+yy923:
+	YYDEBUG(923, *YYCURSOR);
+	yyaccept = 16;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yybm[0+yych] & 16) {
+		goto yy56;
+	}
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
-	case 'T':	case 'W':	case 'Y':	case 'd':	case 'f':	case 'h':	case 'm':	case 's':
-	case 't':	case 'w':	case 'y':	goto yy57;
 	case '0':
+<<<<<<< parse_date.c
+	case '1':
+=======
 	case '1':	goto yy950;
+>>>>>>> 1.55
 	case '2':
 	case '3':
 	case '4':
@@ -13143,6 +15843,8 @@ yy949:
 	case '7':
 	case '8':
 	case '9':	goto yy51;
+<<<<<<< parse_date.c
+=======
 	default:	goto yy924;
 	}
 yy950:
@@ -13155,19 +15857,34 @@ yy950:
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case ' ':	goto yy56;
+>>>>>>> 1.55
 	case 'D':	case 'd':	goto yy61;
 	case 'F':	case 'f':	goto yy63;
 	case 'H':	case 'h':	goto yy60;
 	case 'M':	case 'm':	goto yy59;
 	case 'S':	case 's':	goto yy58;
+<<<<<<< parse_date.c
+	case 'T':	goto yy925;
+=======
 	case 'T':	goto yy952;
+>>>>>>> 1.55
 	case 'W':	case 'w':	goto yy62;
 	case 'Y':	case 'y':	goto yy64;
+<<<<<<< parse_date.c
+	case 't':	goto yy926;
+	default:	goto yy924;
+=======
 	case 't':	goto yy953;
 	default:	goto yy951;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy924:
+	YYDEBUG(924, *YYCURSOR);
+=======
 yy951:
 	YYDEBUG(951, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1151 "ext/date/lib/parse_date.re"
 {
@@ -13180,17 +15897,32 @@ yy951:
 		TIMELIB_DEINIT;
 		return TIMELIB_DATE_NOCOLON;
 	}
+<<<<<<< parse_date.c
+#line 11587 "ext/date/lib/parse_date.c"
+yy925:
+	YYDEBUG(925, *YYCURSOR);
+=======
 #line 11253 "ext/date/lib/parse_date.c"
 yy952:
 	YYDEBUG(952, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'H'){
 		if(yych <= '2'){
 			if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+			if(yych <= '1')	goto yy942;
+			goto yy943;
+=======
 			if(yych <= '1')	goto yy967;
 			goto yy968;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '9')	goto yy944;
+=======
 			if(yych <= '9')	goto yy969;
+>>>>>>> 1.55
 			if(yych <= 'G')	goto yy53;
 			goto yy66;
 		}
@@ -13204,16 +15936,30 @@ yy952:
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy926:
+	YYDEBUG(926, *YYCURSOR);
+=======
 yy953:
 	YYDEBUG(953, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'H'){
 		if(yych <= '2'){
 			if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+			if(yych >= '2')	goto yy928;
+			goto yy927;
+=======
 			if(yych >= '2')	goto yy955;
 			goto yy954;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '9')	goto yy929;
+=======
 			if(yych <= '9')	goto yy956;
+>>>>>>> 1.55
 			if(yych <= 'G')	goto yy53;
 			goto yy66;
 		}
@@ -13227,6 +15973,10 @@ yy953:
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy927:
+	YYDEBUG(927, *YYCURSOR);
+=======
 yy954:
 	YYDEBUG(954, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13243,32 +15993,113 @@ yy955:
 	goto yy53;
 yy956:
 	YYDEBUG(956, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '5')	goto yy936;
+	if(yych <= '9')	goto yy929;
+	goto yy53;
+yy928:
+	YYDEBUG(928, *YYCURSOR);
+=======
 	if(yych >= '6')	goto yy53;
 	goto yy957;
 yy957:
 	YYDEBUG(957, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '3')	goto yy936;
+	if(yych <= '5')	goto yy930;
+	goto yy53;
+yy929:
+	YYDEBUG(929, *YYCURSOR);
+=======
 	if(yych >= ':')	goto yy53;
 	goto yy958;
 yy958:
 	YYDEBUG(958, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych >= '6')	goto yy53;
+	goto yy930;
+yy930:
+	YYDEBUG(930, *YYCURSOR);
+=======
 	if(yych <= '5')	goto yy959;
 	if(yych <= '6')	goto yy960;
 	goto yy53;
 yy959:
 	YYDEBUG(959, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych >= ':')	goto yy53;
+	goto yy931;
+yy931:
+	YYDEBUG(931, *YYCURSOR);
+=======
 	if(yych <= '9')	goto yy944;
 	goto yy53;
 yy960:
 	YYDEBUG(960, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy932;
+	if(yych <= '6')	goto yy933;
+	goto yy53;
+yy932:
+	YYDEBUG(932, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy934;
+	goto yy53;
+yy933:
+	YYDEBUG(933, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych != '0')	goto yy53;
+	goto yy934;
+yy934:
+	YYDEBUG(934, *YYCURSOR);
+	++YYCURSOR;
+	goto yy935;
+yy935:
+	YYDEBUG(935, *YYCURSOR);
+
+#line 1162 "ext/date/lib/parse_date.re"
+{
+		int tz_not_found;
+		DEBUG_OUTPUT("xmlrpc | xmlrpcnocolon | soap | wddx");
+		TIMELIB_INIT;
+		TIMELIB_HAVE_TIME();
+		TIMELIB_HAVE_DATE();
+		s->time->y = timelib_get_nr((char **) &ptr, 4);
+		s->time->m = timelib_get_nr((char **) &ptr, 2);
+		s->time->d = timelib_get_nr((char **) &ptr, 2);
+		s->time->h = timelib_get_nr((char **) &ptr, 2);
+		s->time->i = timelib_get_nr((char **) &ptr, 2);
+		s->time->s = timelib_get_nr((char **) &ptr, 2);
+		if (*ptr == '.') {
+			s->time->f = timelib_get_frac_nr((char **) &ptr, 9);
+			if (*ptr) { /* timezone is optional */
+				s->time->z = timelib_get_zone((char **) &ptr, &s->time->dst, s->time, &tz_not_found, s->tzdb);
+				s->errors += tz_not_found;
+			}
+		}
+		TIMELIB_DEINIT;
+		return TIMELIB_XMLRPC_SOAP;
+	}
+#line 11686 "ext/date/lib/parse_date.c"
+yy936:
+	YYDEBUG(936, *YYCURSOR);
+=======
 	if(yych == '0')	goto yy944;
 	goto yy53;
 yy961:
@@ -13288,34 +16119,73 @@ yy962:
 	goto yy53;
 yy963:
 	YYDEBUG(963, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '5')	goto yy937;
+	if(yych <= '9')	goto yy931;
+=======
 	if(yych <= '5')	goto yy965;
 	if(yych <= '6')	goto yy966;
 	if(yych <= '9')	goto yy944;
+>>>>>>> 1.55
 	goto yy53;
 yy964:
 	YYDEBUG(964, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '5')	goto yy938;
+	if(yych <= '6')	goto yy939;
+	if(yych <= '9')	goto yy931;
+=======
 	if(yych <= '0')	goto yy965;
 	if(yych <= '5')	goto yy959;
 	if(yych <= '6')	goto yy960;
+>>>>>>> 1.55
 	goto yy53;
 yy965:
 	YYDEBUG(965, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy940;
+	if(yych <= '6')	goto yy941;
+	if(yych <= '9')	goto yy934;
+	goto yy53;
+yy939:
+	YYDEBUG(939, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy945;
 	if(yych <= '9')	goto yy944;
 	goto yy945;
 yy966:
 	YYDEBUG(966, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '0')	goto yy940;
+	if(yych <= '5')	goto yy932;
+	if(yych <= '6')	goto yy933;
+	goto yy53;
+yy940:
+	YYDEBUG(940, *YYCURSOR);
+=======
 	if(yych == '0')	goto yy944;
 	goto yy945;
 yy967:
 	YYDEBUG(967, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy935;
+	if(yych <= '9')	goto yy934;
+	goto yy935;
+yy941:
+	YYDEBUG(941, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '5')	goto yy976;
 	if(yych <= '9')	goto yy969;
@@ -13323,7 +16193,14 @@ yy967:
 	goto yy53;
 yy968:
 	YYDEBUG(968, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == '0')	goto yy934;
+	goto yy935;
+yy942:
+	YYDEBUG(942, *YYCURSOR);
+=======
 	if(yych <= '5'){
 		if(yych <= '/')	goto yy53;
 		if(yych <= '3')	goto yy976;
@@ -13334,73 +16211,172 @@ yy968:
 	}
 yy969:
 	YYDEBUG(969, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '5')	goto yy951;
+	if(yych <= '9')	goto yy944;
+	if(yych <= ':')	goto yy945;
+	goto yy53;
+yy943:
+	YYDEBUG(943, *YYCURSOR);
+=======
 	if(yych <= '5')	goto yy957;
 	if(yych != ':')	goto yy53;
 	goto yy970;
 yy970:
 	YYDEBUG(970, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '5'){
+		if(yych <= '/')	goto yy53;
+		if(yych <= '3')	goto yy951;
+		goto yy930;
+	} else {
+		if(yych == ':')	goto yy945;
+		goto yy53;
+	}
+yy944:
+	YYDEBUG(944, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych >= '6')	goto yy53;
 	goto yy971;
 yy971:
 	YYDEBUG(971, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '5')	goto yy930;
+	if(yych != ':')	goto yy53;
+	goto yy945;
+yy945:
+	YYDEBUG(945, *YYCURSOR);
+=======
 	if(yych >= ':')	goto yy53;
 	goto yy972;
 yy972:
 	YYDEBUG(972, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych >= '6')	goto yy53;
+	goto yy946;
+yy946:
+	YYDEBUG(946, *YYCURSOR);
+=======
 	if(yych != ':')	goto yy53;
 	goto yy973;
 yy973:
 	YYDEBUG(973, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych >= ':')	goto yy53;
+	goto yy947;
+yy947:
+	YYDEBUG(947, *YYCURSOR);
+=======
 	if(yych <= '5')	goto yy974;
 	if(yych <= '6')	goto yy975;
 	goto yy53;
 yy974:
 	YYDEBUG(974, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != ':')	goto yy53;
+	goto yy948;
+yy948:
+	YYDEBUG(948, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '9')	goto yy944;
 	goto yy53;
 yy975:
 	YYDEBUG(975, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy949;
+	if(yych <= '6')	goto yy950;
+=======
 	if(yych == '0')	goto yy944;
+>>>>>>> 1.55
 	goto yy53;
 yy976:
 	YYDEBUG(976, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy934;
+=======
 	if(yych <= '5')	goto yy962;
 	if(yych <= '9')	goto yy958;
 	if(yych <= ':')	goto yy970;
+>>>>>>> 1.55
 	goto yy53;
 yy977:
 	YYDEBUG(977, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych == '0')	goto yy934;
+	goto yy53;
+yy951:
+	YYDEBUG(951, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy937;
+	if(yych <= '9')	goto yy931;
+	if(yych <= ':')	goto yy945;
+	goto yy53;
+yy952:
+	YYDEBUG(952, *YYCURSOR);
+	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
 	if(yych <= '0')	goto yy51;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy916;
+=======
 	if(yych <= '9')	goto yy923;
+>>>>>>> 1.55
 	goto yy57;
+<<<<<<< parse_date.c
+yy953:
+	YYDEBUG(953, *YYCURSOR);
+=======
 yy978:
 	YYDEBUG(978, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '2'){
 		if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+		if(yych <= '0')	goto yy920;
+		goto yy921;
+=======
 		if(yych <= '0')	goto yy947;
 		goto yy948;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= '3')	goto yy922;
+		if(yych <= '9')	goto yy916;
+=======
 		if(yych <= '3')	goto yy949;
 		if(yych <= '9')	goto yy923;
+>>>>>>> 1.55
 		goto yy57;
 	}
+<<<<<<< parse_date.c
+yy954:
+	YYDEBUG(954, *YYCURSOR);
+=======
 yy979:
 	YYDEBUG(979, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13416,7 +16392,22 @@ yy980:
 	goto yy981;
 yy981:
 	YYDEBUG(981, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'C')	goto yy955;
+	if(yych != 'c')	goto yy53;
+	goto yy955;
+yy955:
+	YYDEBUG(955, *YYCURSOR);
+	yyaccept = 17;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == 'E')	goto yy956;
+	if(yych != 'e')	goto yy891;
+	goto yy956;
+yy956:
+	YYDEBUG(956, *YYCURSOR);
+=======
 	if(yych == 'M')	goto yy982;
 	if(yych != 'm')	goto yy53;
 	goto yy982;
@@ -13428,23 +16419,59 @@ yy982:
 	goto yy983;
 yy983:
 	YYDEBUG(983, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'M')	goto yy957;
+	if(yych != 'm')	goto yy53;
+	goto yy957;
+yy957:
+	YYDEBUG(957, *YYCURSOR);
+=======
 	if(yych == 'E')	goto yy984;
 	if(yych != 'e')	goto yy53;
 	goto yy984;
 yy984:
 	YYDEBUG(984, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy958;
+	if(yych != 'b')	goto yy53;
+	goto yy958;
+yy958:
+	YYDEBUG(958, *YYCURSOR);
+=======
 	if(yych == 'R')	goto yy985;
 	if(yych != 'r')	goto yy53;
 	goto yy985;
 yy985:
 	YYDEBUG(985, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy959;
+	if(yych != 'e')	goto yy53;
+	goto yy959;
+yy959:
+	YYDEBUG(959, *YYCURSOR);
+=======
 	goto yy897;
 yy986:
 	YYDEBUG(986, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'R')	goto yy960;
+	if(yych != 'r')	goto yy53;
+	goto yy960;
+yy960:
+	YYDEBUG(960, *YYCURSOR);
 	yych = *++YYCURSOR;
+	goto yy891;
+yy961:
+	YYDEBUG(961, *YYCURSOR);
+=======
 	if(yych == 'V')	goto yy987;
 	if(yych != 'v')	goto yy53;
 	goto yy987;
@@ -13457,7 +16484,22 @@ yy987:
 	goto yy988;
 yy988:
 	YYDEBUG(988, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'V')	goto yy962;
+	if(yych != 'v')	goto yy53;
+	goto yy962;
+yy962:
+	YYDEBUG(962, *YYCURSOR);
+	yyaccept = 17;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == 'E')	goto yy963;
+	if(yych != 'e')	goto yy891;
+	goto yy963;
+yy963:
+	YYDEBUG(963, *YYCURSOR);
+=======
 	if(yych == 'M')	goto yy989;
 	if(yych != 'm')	goto yy53;
 	goto yy989;
@@ -13469,19 +16511,49 @@ yy989:
 	goto yy990;
 yy990:
 	YYDEBUG(990, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'M')	goto yy964;
+	if(yych != 'm')	goto yy53;
+	goto yy964;
+yy964:
+	YYDEBUG(964, *YYCURSOR);
+=======
 	if(yych == 'E')	goto yy991;
 	if(yych != 'e')	goto yy53;
 	goto yy991;
 yy991:
 	YYDEBUG(991, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy965;
+	if(yych != 'b')	goto yy53;
+	goto yy965;
+yy965:
+	YYDEBUG(965, *YYCURSOR);
+=======
 	if(yych == 'R')	goto yy985;
 	if(yych == 'r')	goto yy985;
 	goto yy53;
 yy992:
 	YYDEBUG(992, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy966;
+	if(yych != 'e')	goto yy53;
+	goto yy966;
+yy966:
+	YYDEBUG(966, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy960;
+	if(yych == 'r')	goto yy960;
+	goto yy53;
+yy967:
+	YYDEBUG(967, *YYCURSOR);
+=======
 	if(yych == 'T')	goto yy993;
 	if(yych != 't')	goto yy53;
 	goto yy993;
@@ -13494,7 +16566,22 @@ yy993:
 	goto yy994;
 yy994:
 	YYDEBUG(994, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'T')	goto yy968;
+	if(yych != 't')	goto yy53;
+	goto yy968;
+yy968:
+	YYDEBUG(968, *YYCURSOR);
+	yyaccept = 17;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == 'O')	goto yy969;
+	if(yych != 'o')	goto yy891;
+	goto yy969;
+yy969:
+	YYDEBUG(969, *YYCURSOR);
+=======
 	if(yych == 'B')	goto yy995;
 	if(yych != 'b')	goto yy53;
 	goto yy995;
@@ -13506,26 +16593,59 @@ yy995:
 	goto yy996;
 yy996:
 	YYDEBUG(996, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy970;
+	if(yych != 'b')	goto yy53;
+	goto yy970;
+yy970:
+	YYDEBUG(970, *YYCURSOR);
+=======
 	if(yych == 'R')	goto yy985;
 	if(yych == 'r')	goto yy985;
 	goto yy53;
 yy997:
 	YYDEBUG(997, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+	if(yych == 'E')	goto yy971;
+	if(yych != 'e')	goto yy53;
+	goto yy971;
+yy971:
+	YYDEBUG(971, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy960;
+	if(yych == 'r')	goto yy960;
+	goto yy53;
+yy972:
+	YYDEBUG(972, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'P'){
 		if(yych == 'C')	goto yy121;
 		if(yych <= 'O')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy973;
+=======
 		goto yy998;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'c'){
 			if(yych <= 'b')	goto yy53;
 			goto yy121;
 		} else {
 			if(yych != 'p')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy973;
+=======
 			goto yy998;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy973:
+	YYDEBUG(973, *YYCURSOR);
+=======
 yy998:
 	YYDEBUG(998, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13541,7 +16661,22 @@ yy999:
 	goto yy1000;
 yy1000:
 	YYDEBUG(1000, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'T')	goto yy974;
+	if(yych != 't')	goto yy891;
+	goto yy974;
+yy974:
+	YYDEBUG(974, *YYCURSOR);
+	yyaccept = 17;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == 'E')	goto yy975;
+	if(yych != 'e')	goto yy891;
+	goto yy975;
+yy975:
+	YYDEBUG(975, *YYCURSOR);
+=======
 	if(yych == 'M')	goto yy1001;
 	if(yych != 'm')	goto yy53;
 	goto yy1001;
@@ -13553,25 +16688,63 @@ yy1001:
 	goto yy1002;
 yy1002:
 	YYDEBUG(1002, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'M')	goto yy976;
+	if(yych != 'm')	goto yy53;
+	goto yy976;
+yy976:
+	YYDEBUG(976, *YYCURSOR);
+=======
 	if(yych == 'E')	goto yy1003;
 	if(yych != 'e')	goto yy53;
 	goto yy1003;
 yy1003:
 	YYDEBUG(1003, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy977;
+	if(yych != 'b')	goto yy53;
+	goto yy977;
+yy977:
+	YYDEBUG(977, *YYCURSOR);
+=======
 	if(yych == 'R')	goto yy985;
 	if(yych == 'r')	goto yy985;
 	goto yy53;
 yy1004:
 	YYDEBUG(1004, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy978;
+	if(yych != 'e')	goto yy53;
+	goto yy978;
+yy978:
+	YYDEBUG(978, *YYCURSOR);
+=======
 	if(yych == 'G')	goto yy1008;
 	if(yych == 'g')	goto yy1008;
 	goto yy53;
 yy1005:
 	YYDEBUG(1005, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'R')	goto yy960;
+	if(yych == 'r')	goto yy960;
+	goto yy53;
+yy979:
+	YYDEBUG(979, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych == 'G')	goto yy983;
+	if(yych == 'g')	goto yy983;
+	goto yy53;
+yy980:
+	YYDEBUG(980, *YYCURSOR);
+=======
 	if(yych == 'R')	goto yy1006;
 	if(yych != 'r')	goto yy53;
 	goto yy1006;
@@ -13584,49 +16757,131 @@ yy1006:
 	goto yy1007;
 yy1007:
 	YYDEBUG(1007, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'R')	goto yy981;
+	if(yych != 'r')	goto yy53;
+	goto yy981;
+yy981:
+	YYDEBUG(981, *YYCURSOR);
+=======
 	if(yych == 'L')	goto yy985;
 	if(yych == 'l')	goto yy985;
 	goto yy53;
 yy1008:
 	YYDEBUG(1008, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == 'I')	goto yy982;
+	if(yych != 'i')	goto yy891;
+	goto yy982;
+yy982:
+	YYDEBUG(982, *YYCURSOR);
+=======
 	if(yych == 'U')	goto yy1009;
 	if(yych != 'u')	goto yy897;
 	goto yy1009;
 yy1009:
 	YYDEBUG(1009, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'L')	goto yy960;
+	if(yych == 'l')	goto yy960;
+	goto yy53;
+yy983:
+	YYDEBUG(983, *YYCURSOR);
+	yyaccept = 17;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == 'U')	goto yy984;
+	if(yych != 'u')	goto yy891;
+	goto yy984;
+yy984:
+	YYDEBUG(984, *YYCURSOR);
+=======
 	if(yych == 'S')	goto yy1010;
 	if(yych != 's')	goto yy53;
 	goto yy1010;
 yy1010:
 	YYDEBUG(1010, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'S')	goto yy985;
+	if(yych != 's')	goto yy53;
+	goto yy985;
+yy985:
+	YYDEBUG(985, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych == 'T')	goto yy960;
+	if(yych == 't')	goto yy960;
+=======
 	if(yych == 'T')	goto yy985;
 	if(yych == 't')	goto yy985;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy986:
+	YYDEBUG(986, *YYCURSOR);
+=======
 yy1011:
 	YYDEBUG(1011, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'Y'){
+<<<<<<< parse_date.c
+		if(yych == 'R')	goto yy987;
+=======
 		if(yych == 'R')	goto yy1012;
+>>>>>>> 1.55
 		if(yych <= 'X')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy960;
+=======
 		goto yy985;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
 			if(yych <= 'q')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy987;
+=======
 			goto yy1012;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'y')	goto yy960;
+=======
 			if(yych == 'y')	goto yy985;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy987:
+	YYDEBUG(987, *YYCURSOR);
+=======
 yy1012:
 	YYDEBUG(1012, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == 'C')	goto yy988;
+	if(yych != 'c')	goto yy891;
+	goto yy988;
+yy988:
+	YYDEBUG(988, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'H')	goto yy960;
+	if(yych == 'h')	goto yy960;
+	goto yy53;
+yy989:
+	YYDEBUG(989, *YYCURSOR);
+=======
 	if(yych == 'C')	goto yy1013;
 	if(yych != 'c')	goto yy897;
 	goto yy1013;
@@ -13651,7 +16906,22 @@ yy1015:
 	goto yy1016;
 yy1016:
 	YYDEBUG(1016, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy990;
+	if(yych != 'b')	goto yy53;
+	goto yy990;
+yy990:
+	YYDEBUG(990, *YYCURSOR);
+	yyaccept = 17;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == 'R')	goto yy991;
+	if(yych != 'r')	goto yy891;
+	goto yy991;
+yy991:
+	YYDEBUG(991, *YYCURSOR);
+=======
 	if(yych == 'U')	goto yy1017;
 	if(yych != 'u')	goto yy53;
 	goto yy1017;
@@ -13663,32 +16933,81 @@ yy1017:
 	goto yy1018;
 yy1018:
 	YYDEBUG(1018, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'U')	goto yy992;
+	if(yych != 'u')	goto yy53;
+	goto yy992;
+yy992:
+	YYDEBUG(992, *YYCURSOR);
+=======
 	if(yych == 'R')	goto yy1019;
 	if(yych != 'r')	goto yy53;
 	goto yy1019;
 yy1019:
 	YYDEBUG(1019, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy993;
+	if(yych != 'a')	goto yy53;
+	goto yy993;
+yy993:
+	YYDEBUG(993, *YYCURSOR);
+=======
 	if(yych == 'Y')	goto yy985;
 	if(yych == 'y')	goto yy985;
 	goto yy53;
 yy1020:
 	YYDEBUG(1020, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy994;
+	if(yych != 'r')	goto yy53;
+	goto yy994;
+yy994:
+	YYDEBUG(994, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'Y')	goto yy960;
+	if(yych == 'y')	goto yy960;
+	goto yy53;
+yy995:
+	YYDEBUG(995, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
+<<<<<<< parse_date.c
+		if(yych == 'L')	goto yy1002;
+=======
 		if(yych == 'L')	goto yy1027;
+>>>>>>> 1.55
 		if(yych <= 'M')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy1001;
+=======
 		goto yy1026;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'l'){
 			if(yych <= 'k')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy1002;
+=======
 			goto yy1027;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'n')	goto yy1001;
+=======
 			if(yych == 'n')	goto yy1026;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy996:
+	YYDEBUG(996, *YYCURSOR);
+=======
 yy1021:
 	YYDEBUG(1021, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13704,7 +17023,22 @@ yy1022:
 	goto yy1023;
 yy1023:
 	YYDEBUG(1023, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'N')	goto yy997;
+	if(yych != 'n')	goto yy53;
+	goto yy997;
+yy997:
+	YYDEBUG(997, *YYCURSOR);
+	yyaccept = 17;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == 'U')	goto yy998;
+	if(yych != 'u')	goto yy891;
+	goto yy998;
+yy998:
+	YYDEBUG(998, *YYCURSOR);
+=======
 	if(yych == 'A')	goto yy1024;
 	if(yych != 'a')	goto yy53;
 	goto yy1024;
@@ -13716,175 +17050,381 @@ yy1024:
 	goto yy1025;
 yy1025:
 	YYDEBUG(1025, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy999;
+	if(yych != 'a')	goto yy53;
+	goto yy999;
+yy999:
+	YYDEBUG(999, *YYCURSOR);
+=======
 	if(yych == 'Y')	goto yy985;
 	if(yych == 'y')	goto yy985;
 	goto yy53;
 yy1026:
 	YYDEBUG(1026, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'R')	goto yy1000;
+	if(yych != 'r')	goto yy53;
+	goto yy1000;
+yy1000:
+	YYDEBUG(1000, *YYCURSOR);
+=======
 	if(yych == 'E')	goto yy985;
 	if(yych == 'e')	goto yy985;
 	goto yy897;
 yy1027:
 	YYDEBUG(1027, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'Y')	goto yy960;
+	if(yych == 'y')	goto yy960;
+	goto yy53;
+yy1001:
+	YYDEBUG(1001, *YYCURSOR);
+=======
 	if(yych == 'Y')	goto yy985;
 	if(yych == 'y')	goto yy985;
 	goto yy897;
 yy1028:
 	YYDEBUG(1028, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy960;
+	if(yych == 'e')	goto yy960;
+	goto yy891;
+yy1002:
+	YYDEBUG(1002, *YYCURSOR);
+=======
 	if(yych == 'I')	goto yy985;
 	goto yy897;
 yy1029:
 	YYDEBUG(1029, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'Y')	goto yy960;
+	if(yych == 'y')	goto yy960;
+	goto yy891;
+yy1003:
+	YYDEBUG(1003, *YYCURSOR);
+=======
 	if(yych != 'I')	goto yy897;
 	goto yy1030;
 yy1030:
 	YYDEBUG(1030, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'I')	goto yy960;
+	goto yy891;
+yy1004:
+	YYDEBUG(1004, *YYCURSOR);
+=======
 	if(yych == 'I')	goto yy985;
 	goto yy897;
 yy1031:
 	YYDEBUG(1031, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != 'I')	goto yy891;
+	goto yy1005;
+yy1005:
+	YYDEBUG(1005, *YYCURSOR);
+=======
 	if(yych == 'I')	goto yy985;
 	goto yy897;
 yy1032:
 	YYDEBUG(1032, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'I')	goto yy960;
+	goto yy891;
+yy1006:
+	YYDEBUG(1006, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '0')	goto yy1045;
 	if(yych <= '9')	goto yy1044;
 	goto yy53;
 yy1033:
 	YYDEBUG(1033, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'I')	goto yy960;
+	goto yy891;
+yy1007:
+	YYDEBUG(1007, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '9')	goto yy1043;
 	goto yy53;
 yy1034:
 	YYDEBUG(1034, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '0')	goto yy1020;
+	if(yych <= '9')	goto yy1019;
+=======
 	if(yych <= '5')	goto yy1041;
 	if(yych <= '6')	goto yy1040;
+>>>>>>> 1.55
 	goto yy53;
 yy1035:
 	YYDEBUG(1035, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy1018;
+=======
 	if(yych == 'E')	goto yy1014;
 	if(yych == 'e')	goto yy1014;
+>>>>>>> 1.55
 	goto yy53;
 yy1036:
 	YYDEBUG(1036, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy1016;
+	if(yych <= '6')	goto yy1015;
+=======
 	if(yych == 'A')	goto yy1011;
 	if(yych == 'a')	goto yy1011;
+>>>>>>> 1.55
 	goto yy53;
 yy1037:
 	YYDEBUG(1037, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy989;
+	if(yych == 'e')	goto yy989;
+=======
 	if(yych == 'E')	goto yy1039;
 	if(yych == 'e')	goto yy1039;
+>>>>>>> 1.55
 	goto yy53;
 yy1038:
 	YYDEBUG(1038, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy986;
+	if(yych == 'a')	goto yy986;
+=======
 	if(yych == 'E')	goto yy979;
 	if(yych == 'e')	goto yy979;
+>>>>>>> 1.55
 	goto yy53;
 yy1039:
 	YYDEBUG(1039, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy1014;
+	if(yych == 'e')	goto yy1014;
+=======
 	if(yych == 'P')	goto yy998;
 	if(yych == 'p')	goto yy998;
+>>>>>>> 1.55
 	goto yy53;
 yy1040:
 	YYDEBUG(1040, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy954;
+	if(yych == 'e')	goto yy954;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '6')	goto yy1042;
+>>>>>>> 1.55
 	goto yy53;
 yy1041:
 	YYDEBUG(1041, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'P')	goto yy973;
+	if(yych == 'p')	goto yy973;
+	goto yy53;
+yy1015:
+	YYDEBUG(1015, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych >= ':')	goto yy53;
 	goto yy1042;
 yy1042:
 	YYDEBUG(1042, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '6')	goto yy1017;
+	goto yy53;
+yy1016:
+	YYDEBUG(1016, *YYCURSOR);
+=======
 	goto yy924;
 yy1043:
 	YYDEBUG(1043, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych >= ':')	goto yy53;
+	goto yy1017;
+yy1017:
+	YYDEBUG(1017, *YYCURSOR);
+=======
 	if(yych <= '9')	goto yy1042;
 	goto yy53;
 yy1044:
 	YYDEBUG(1044, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	goto yy917;
+yy1018:
+	YYDEBUG(1018, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '9')	goto yy1042;
 	goto yy53;
 yy1045:
 	YYDEBUG(1045, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy1017;
+=======
 	if(yych <= '0')	goto yy53;
 	if(yych <= '9')	goto yy1042;
+>>>>>>> 1.55
 	goto yy53;
 yy1046:
 	YYDEBUG(1046, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy1017;
+=======
 	if(yych <= '.')	goto yy53;
 	if(yych <= '/')	goto yy1049;
 	if(yych <= '0')	goto yy1048;
 	if(yych <= '9')	goto yy1059;
+>>>>>>> 1.55
 	goto yy53;
 yy1047:
 	YYDEBUG(1047, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '0')	goto yy53;
+	if(yych <= '9')	goto yy1017;
+=======
 	if(yych <= '.')	goto yy53;
 	if(yych <= '/')	goto yy1049;
 	if(yych <= '2')	goto yy1059;
+>>>>>>> 1.55
 	goto yy53;
 yy1048:
 	YYDEBUG(1048, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '.')	goto yy53;
+	if(yych <= '/')	goto yy1024;
+	if(yych <= '0')	goto yy1023;
+	if(yych <= '9')	goto yy1034;
+	goto yy53;
+yy1022:
+	YYDEBUG(1022, *YYCURSOR);
+=======
 	if(yych != '/')	goto yy53;
 	goto yy1049;
 yy1049:
 	YYDEBUG(1049, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '.')	goto yy53;
+	if(yych <= '/')	goto yy1024;
+	if(yych <= '2')	goto yy1034;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '2')	goto yy1050;
 	if(yych <= '3')	goto yy1052;
 	if(yych <= '9')	goto yy1053;
+>>>>>>> 1.55
+	goto yy53;
+<<<<<<< parse_date.c
+yy1023:
+	YYDEBUG(1023, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych != '/')	goto yy53;
+	goto yy1024;
+yy1024:
+	YYDEBUG(1024, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '2')	goto yy1025;
+	if(yych <= '3')	goto yy1027;
+	if(yych <= '9')	goto yy1028;
 	goto yy53;
+yy1025:
+	YYDEBUG(1025, *YYCURSOR);
+=======
 yy1050:
 	YYDEBUG(1050, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych <= '/')	goto yy1026;
+		if(yych <= '9')	goto yy1028;
+		if(yych >= 'n')	goto yy1030;
+		goto yy1026;
+=======
 		if(yych <= '/')	goto yy1051;
 		if(yych <= '9')	goto yy1053;
 		if(yych >= 'n')	goto yy1055;
 		goto yy1051;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych >= 'r')	goto yy1031;
+			goto yy1026;
+=======
 			if(yych >= 'r')	goto yy1056;
 			goto yy1051;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1029;
+			if(yych <= 't')	goto yy1032;
+			goto yy1026;
+=======
 			if(yych <= 's')	goto yy1054;
 			if(yych <= 't')	goto yy1057;
 			goto yy1051;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1026:
+	YYDEBUG(1026, *YYCURSOR);
+=======
 yy1051:
 	YYDEBUG(1051, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1048 "ext/date/lib/parse_date.re"
 {
@@ -13897,39 +17437,84 @@ yy1051:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_DATE;
 	}
+<<<<<<< parse_date.c
+#line 12131 "ext/date/lib/parse_date.c"
+yy1027:
+	YYDEBUG(1027, *YYCURSOR);
+=======
 #line 11770 "ext/date/lib/parse_date.c"
 yy1052:
 	YYDEBUG(1052, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych <= '/')	goto yy1026;
+		if(yych <= '1')	goto yy1028;
+		if(yych <= 'm')	goto yy1026;
+		goto yy1030;
+=======
 		if(yych <= '/')	goto yy1051;
 		if(yych <= '1')	goto yy1053;
 		if(yych <= 'm')	goto yy1051;
 		goto yy1055;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'q')	goto yy1026;
+			goto yy1031;
+=======
 			if(yych <= 'q')	goto yy1051;
 			goto yy1056;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1029;
+			if(yych <= 't')	goto yy1032;
+			goto yy1026;
+=======
 			if(yych <= 's')	goto yy1054;
 			if(yych <= 't')	goto yy1057;
 			goto yy1051;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1028:
+	YYDEBUG(1028, *YYCURSOR);
+=======
 yy1053:
 	YYDEBUG(1053, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'q'){
+<<<<<<< parse_date.c
+		if(yych == 'n')	goto yy1030;
+		goto yy1026;
+=======
 		if(yych == 'n')	goto yy1055;
 		goto yy1051;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'r')	goto yy1031;
+		if(yych <= 's')	goto yy1029;
+		if(yych <= 't')	goto yy1032;
+		goto yy1026;
+=======
 		if(yych <= 'r')	goto yy1056;
 		if(yych <= 's')	goto yy1054;
 		if(yych <= 't')	goto yy1057;
 		goto yy1051;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1029:
+	YYDEBUG(1029, *YYCURSOR);
+=======
 yy1054:
 	YYDEBUG(1054, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -13942,158 +17527,364 @@ yy1055:
 	goto yy53;
 yy1056:
 	YYDEBUG(1056, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 't')	goto yy1033;
+=======
 	if(yych == 'd')	goto yy1058;
+>>>>>>> 1.55
 	goto yy53;
 yy1057:
 	YYDEBUG(1057, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'd')	goto yy1033;
+	goto yy53;
+yy1031:
+	YYDEBUG(1031, *YYCURSOR);
+=======
 	if(yych != 'h')	goto yy53;
 	goto yy1058;
 yy1058:
 	YYDEBUG(1058, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'd')	goto yy1033;
+	goto yy53;
+yy1032:
+	YYDEBUG(1032, *YYCURSOR);
+=======
 	goto yy1051;
 yy1059:
 	YYDEBUG(1059, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != 'h')	goto yy53;
+	goto yy1033;
+yy1033:
+	YYDEBUG(1033, *YYCURSOR);
+=======
 	if(yych != '/')	goto yy53;
 	goto yy1060;
 yy1060:
 	YYDEBUG(1060, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+	goto yy1026;
+yy1034:
+	YYDEBUG(1034, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych != '/')	goto yy53;
+	goto yy1035;
+yy1035:
+	YYDEBUG(1035, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '2'){
 		if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+		if(yych >= '1')	goto yy1037;
+		goto yy1036;
+=======
 		if(yych >= '1')	goto yy1062;
 		goto yy1061;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= '3')	goto yy1038;
+		if(yych <= '9')	goto yy1028;
+=======
 		if(yych <= '3')	goto yy1063;
 		if(yych <= '9')	goto yy1053;
+>>>>>>> 1.55
 		goto yy53;
 	}
+<<<<<<< parse_date.c
+yy1036:
+	YYDEBUG(1036, *YYCURSOR);
+=======
 yy1061:
 	YYDEBUG(1061, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
 		if(yych <= '0'){
+<<<<<<< parse_date.c
+			if(yych <= '/')	goto yy1026;
+			goto yy1028;
+=======
 			if(yych <= '/')	goto yy1051;
 			goto yy1053;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '9')	goto yy1039;
+			if(yych <= 'm')	goto yy1026;
+			goto yy1030;
+=======
 			if(yych <= '9')	goto yy1064;
 			if(yych <= 'm')	goto yy1051;
 			goto yy1055;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'q')	goto yy1026;
+			goto yy1031;
+=======
 			if(yych <= 'q')	goto yy1051;
 			goto yy1056;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1029;
+			if(yych <= 't')	goto yy1032;
+			goto yy1026;
+=======
 			if(yych <= 's')	goto yy1054;
 			if(yych <= 't')	goto yy1057;
 			goto yy1051;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1037:
+	YYDEBUG(1037, *YYCURSOR);
+=======
 yy1062:
 	YYDEBUG(1062, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych <= '/')	goto yy1026;
+		if(yych <= '9')	goto yy1039;
+		if(yych <= 'm')	goto yy1026;
+		goto yy1030;
+=======
 		if(yych <= '/')	goto yy1051;
 		if(yych <= '9')	goto yy1064;
 		if(yych <= 'm')	goto yy1051;
 		goto yy1055;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'q')	goto yy1026;
+			goto yy1031;
+=======
 			if(yych <= 'q')	goto yy1051;
 			goto yy1056;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1029;
+			if(yych <= 't')	goto yy1032;
+			goto yy1026;
+=======
 			if(yych <= 's')	goto yy1054;
 			if(yych <= 't')	goto yy1057;
 			goto yy1051;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1038:
+	YYDEBUG(1038, *YYCURSOR);
+=======
 yy1063:
 	YYDEBUG(1063, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych <= '/')	goto yy1026;
+		if(yych <= '1')	goto yy1039;
+		if(yych <= 'm')	goto yy1026;
+		goto yy1030;
+=======
 		if(yych <= '/')	goto yy1051;
 		if(yych <= '1')	goto yy1064;
 		if(yych <= 'm')	goto yy1051;
 		goto yy1055;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'q')	goto yy1026;
+			goto yy1031;
+=======
 			if(yych <= 'q')	goto yy1051;
 			goto yy1056;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1029;
+			if(yych <= 't')	goto yy1032;
+			goto yy1026;
+=======
 			if(yych <= 's')	goto yy1054;
 			if(yych <= 't')	goto yy1057;
 			goto yy1051;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1039:
+	YYDEBUG(1039, *YYCURSOR);
+=======
 yy1064:
 	YYDEBUG(1064, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych == '/')	goto yy1033;
+		if(yych <= 'm')	goto yy1026;
+		goto yy1030;
+=======
 		if(yych == '/')	goto yy1058;
 		if(yych <= 'm')	goto yy1051;
 		goto yy1055;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'q')	goto yy1026;
+			goto yy1031;
+=======
 			if(yych <= 'q')	goto yy1051;
 			goto yy1056;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1029;
+			if(yych <= 't')	goto yy1032;
+			goto yy1026;
+=======
 			if(yych <= 's')	goto yy1054;
 			if(yych <= 't')	goto yy1057;
 			goto yy1051;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1040:
+	YYDEBUG(1040, *YYCURSOR);
+=======
 yy1065:
 	YYDEBUG(1065, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
+<<<<<<< parse_date.c
+		if(yych == 'A')	goto yy1115;
+=======
 		if(yych == 'A')	goto yy1140;
+>>>>>>> 1.55
 		if(yych <= 'T')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy1114;
+=======
 		goto yy1139;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'a'){
 			if(yych <= '`')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy1115;
+=======
 			goto yy1140;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'u')	goto yy1114;
+=======
 			if(yych == 'u')	goto yy1139;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy1041:
+	YYDEBUG(1041, *YYCURSOR);
+=======
 yy1066:
 	YYDEBUG(1066, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy1112;
+	if(yych == 'e')	goto yy1112;
+=======
 	if(yych == 'E')	goto yy1137;
 	if(yych == 'e')	goto yy1137;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy1042:
+	YYDEBUG(1042, *YYCURSOR);
+=======
 yy1067:
 	YYDEBUG(1067, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy1109;
+	if(yych == 'a')	goto yy1109;
+=======
 	if(yych == 'A')	goto yy1134;
 	if(yych == 'a')	goto yy1134;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy1043:
+	YYDEBUG(1043, *YYCURSOR);
+=======
 yy1068:
 	YYDEBUG(1068, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
+<<<<<<< parse_date.c
+		if(yych == 'P')	goto yy1106;
+=======
 		if(yych == 'P')	goto yy1131;
+>>>>>>> 1.55
 		if(yych <= 'T')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy1105;
+=======
 		goto yy1130;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'p'){
 			if(yych <= 'o')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy1106;
+=======
 			goto yy1131;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'u')	goto yy1105;
+=======
 			if(yych == 'u')	goto yy1130;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy1044:
+	YYDEBUG(1044, *YYCURSOR);
+=======
 yy1069:
 	YYDEBUG(1069, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -14108,19 +17899,37 @@ yy1070:
 	goto yy53;
 yy1071:
 	YYDEBUG(1071, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy1102;
+	if(yych == 'e')	goto yy1102;
+=======
 	if(yych == 'O')	goto yy1123;
 	if(yych == 'o')	goto yy1123;
+>>>>>>> 1.55
 	goto yy53;
 yy1072:
 	YYDEBUG(1072, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'C')	goto yy1100;
+	if(yych == 'c')	goto yy1100;
+=======
 	if(yych == 'E')	goto yy1121;
 	if(yych == 'e')	goto yy1121;
+>>>>>>> 1.55
 	goto yy53;
 yy1073:
 	YYDEBUG(1073, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'O')	goto yy1098;
+	if(yych == 'o')	goto yy1098;
+	goto yy53;
+yy1047:
+	YYDEBUG(1047, *YYCURSOR);
+=======
 	if(yych <= '/'){
 		if(yych == '-')	goto yy1076;
 		goto yy53;
@@ -14131,38 +17940,99 @@ yy1073:
 	}
 yy1074:
 	YYDEBUG(1074, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy1096;
+	if(yych == 'e')	goto yy1096;
+=======
 	if(yych == '-')	goto yy1076;
 	if(yych <= '/')	goto yy53;
 	if(yych <= '2')	goto yy1095;
+>>>>>>> 1.55
 	goto yy53;
 yy1075:
 	YYDEBUG(1075, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/'){
+		if(yych == '-')	goto yy1051;
+		goto yy53;
+	} else {
+		if(yych <= '0')	goto yy1050;
+		if(yych <= '9')	goto yy1070;
+		goto yy53;
+	}
+yy1049:
+	YYDEBUG(1049, *YYCURSOR);
+=======
 	if(yych != '-')	goto yy53;
 	goto yy1076;
 yy1076:
 	YYDEBUG(1076, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+	if(yych == '-')	goto yy1051;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '2')	goto yy1070;
+=======
 	if(yych <= '2')	goto yy1077;
 	if(yych <= '3')	goto yy1078;
 	if(yych <= '9')	goto yy1079;
+>>>>>>> 1.55
+	goto yy53;
+<<<<<<< parse_date.c
+yy1050:
+	YYDEBUG(1050, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych != '-')	goto yy53;
+	goto yy1051;
+yy1051:
+	YYDEBUG(1051, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '2')	goto yy1052;
+	if(yych <= '3')	goto yy1053;
+	if(yych <= '9')	goto yy1054;
 	goto yy53;
+yy1052:
+	YYDEBUG(1052, *YYCURSOR);
+=======
 yy1077:
 	YYDEBUG(1077, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'm'){
 		if(yych <= '9'){
+<<<<<<< parse_date.c
+			if(yych <= '/')	goto yy777;
+			goto yy1054;
+=======
 			if(yych <= '/')	goto yy777;
 			goto yy1079;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'T')	goto yy1059;
+			goto yy777;
+=======
 			if(yych == 'T')	goto yy1084;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1056;
+			if(yych <= 'q')	goto yy777;
+			goto yy1057;
+		} else {
+			if(yych <= 's')	goto yy1055;
+			if(yych <= 't')	goto yy1058;
+			goto yy777;
+=======
 			if(yych <= 'n')	goto yy1081;
 			if(yych <= 'q')	goto yy777;
 			goto yy1082;
@@ -14170,22 +18040,47 @@ yy1077:
 			if(yych <= 's')	goto yy1080;
 			if(yych <= 't')	goto yy1083;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1053:
+	YYDEBUG(1053, *YYCURSOR);
+=======
 yy1078:
 	YYDEBUG(1078, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'm'){
 		if(yych <= '1'){
+<<<<<<< parse_date.c
+			if(yych <= '/')	goto yy777;
+			goto yy1054;
+=======
 			if(yych <= '/')	goto yy777;
 			goto yy1079;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'T')	goto yy1059;
+			goto yy777;
+=======
 			if(yych == 'T')	goto yy1084;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1056;
+			if(yych <= 'q')	goto yy777;
+			goto yy1057;
+		} else {
+			if(yych <= 's')	goto yy1055;
+			if(yych <= 't')	goto yy1058;
+			goto yy777;
+=======
 			if(yych <= 'n')	goto yy1081;
 			if(yych <= 'q')	goto yy777;
 			goto yy1082;
@@ -14193,26 +18088,53 @@ yy1078:
 			if(yych <= 's')	goto yy1080;
 			if(yych <= 't')	goto yy1083;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1054:
+	YYDEBUG(1054, *YYCURSOR);
+=======
 yy1079:
 	YYDEBUG(1079, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych == 'T')	goto yy1059;
+		if(yych <= 'm')	goto yy777;
+		goto yy1056;
+=======
 		if(yych == 'T')	goto yy1084;
 		if(yych <= 'm')	goto yy777;
 		goto yy1081;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'q')	goto yy777;
+			goto yy1057;
+=======
 			if(yych <= 'q')	goto yy777;
 			goto yy1082;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1055;
+			if(yych <= 't')	goto yy1058;
+			goto yy777;
+=======
 			if(yych <= 's')	goto yy1080;
 			if(yych <= 't')	goto yy1083;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1055:
+	YYDEBUG(1055, *YYCURSOR);
+=======
 yy1080:
 	YYDEBUG(1080, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -14225,77 +18147,157 @@ yy1081:
 	goto yy53;
 yy1082:
 	YYDEBUG(1082, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 't')	goto yy1069;
+=======
 	if(yych == 'd')	goto yy1094;
+>>>>>>> 1.55
 	goto yy53;
 yy1083:
 	YYDEBUG(1083, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'd')	goto yy1069;
+=======
 	if(yych == 'h')	goto yy1094;
+>>>>>>> 1.55
 	goto yy53;
 yy1084:
 	YYDEBUG(1084, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'd')	goto yy1069;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '1')	goto yy1085;
 	if(yych <= '2')	goto yy1086;
 	if(yych <= '9')	goto yy1087;
+>>>>>>> 1.55
 	goto yy53;
 yy1085:
 	YYDEBUG(1085, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'h')	goto yy1069;
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '9')	goto yy1087;
 	if(yych <= ':')	goto yy1088;
+>>>>>>> 1.55
 	goto yy53;
 yy1086:
 	YYDEBUG(1086, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '1')	goto yy1060;
+	if(yych <= '2')	goto yy1061;
+	if(yych <= '9')	goto yy1062;
+=======
 	if(yych <= '3')	goto yy1087;
 	if(yych == ':')	goto yy1088;
+>>>>>>> 1.55
 	goto yy53;
 yy1087:
 	YYDEBUG(1087, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy1062;
+	if(yych <= ':')	goto yy1063;
+	goto yy53;
+yy1061:
+	YYDEBUG(1061, *YYCURSOR);
+=======
 	if(yych != ':')	goto yy53;
 	goto yy1088;
 yy1088:
 	YYDEBUG(1088, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '3')	goto yy1062;
+	if(yych == ':')	goto yy1063;
+=======
 	if(yych <= '5')	goto yy1089;
 	if(yych <= '9')	goto yy1090;
+>>>>>>> 1.55
 	goto yy53;
 yy1089:
 	YYDEBUG(1089, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != ':')	goto yy53;
+	goto yy1063;
+yy1063:
+	YYDEBUG(1063, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '9')	goto yy1090;
 	if(yych <= ':')	goto yy1091;
 	goto yy53;
 yy1090:
 	YYDEBUG(1090, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy1064;
+	if(yych <= '9')	goto yy1065;
+	goto yy53;
+yy1064:
+	YYDEBUG(1064, *YYCURSOR);
+=======
 	if(yych != ':')	goto yy53;
 	goto yy1091;
 yy1091:
 	YYDEBUG(1091, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy1065;
+	if(yych <= ':')	goto yy1066;
+=======
 	if(yych <= '5')	goto yy1092;
 	if(yych <= '6')	goto yy1093;
 	if(yych <= '9')	goto yy944;
+>>>>>>> 1.55
 	goto yy53;
 yy1092:
 	YYDEBUG(1092, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != ':')	goto yy53;
+	goto yy1066;
+yy1066:
+	YYDEBUG(1066, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy945;
 	if(yych <= '9')	goto yy944;
 	goto yy945;
 yy1093:
 	YYDEBUG(1093, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy1067;
+	if(yych <= '6')	goto yy1068;
+	if(yych <= '9')	goto yy934;
+	goto yy53;
+yy1067:
+	YYDEBUG(1067, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy935;
+	if(yych <= '9')	goto yy934;
+	goto yy935;
+yy1068:
+	YYDEBUG(1068, *YYCURSOR);
+=======
 	if(yych == '0')	goto yy944;
 	goto yy945;
 yy1094:
@@ -14306,36 +18308,90 @@ yy1094:
 	goto yy777;
 yy1095:
 	YYDEBUG(1095, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == '0')	goto yy934;
+	goto yy935;
+yy1069:
+	YYDEBUG(1069, *YYCURSOR);
+	yyaccept = 12;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == 'T')	goto yy1059;
+	goto yy777;
+yy1070:
+	YYDEBUG(1070, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych != '-')	goto yy53;
+	goto yy1071;
+yy1071:
+	YYDEBUG(1071, *YYCURSOR);
+=======
 	if(yych != '-')	goto yy53;
 	goto yy1096;
 yy1096:
 	YYDEBUG(1096, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '2'){
 		if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+		if(yych >= '1')	goto yy1073;
+		goto yy1072;
+=======
 		if(yych >= '1')	goto yy1098;
 		goto yy1097;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= '3')	goto yy1074;
+		if(yych <= '9')	goto yy1054;
+=======
 		if(yych <= '3')	goto yy1099;
 		if(yych <= '9')	goto yy1079;
+>>>>>>> 1.55
 		goto yy53;
 	}
+<<<<<<< parse_date.c
+yy1072:
+	YYDEBUG(1072, *YYCURSOR);
+=======
 yy1097:
 	YYDEBUG(1097, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'm'){
 		if(yych <= '9'){
+<<<<<<< parse_date.c
+			if(yych <= '/')	goto yy777;
+			if(yych <= '0')	goto yy1054;
+			goto yy1075;
+=======
 			if(yych <= '/')	goto yy777;
 			if(yych <= '0')	goto yy1079;
 			goto yy1100;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'T')	goto yy1059;
+			goto yy777;
+=======
 			if(yych == 'T')	goto yy1084;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1056;
+			if(yych <= 'q')	goto yy777;
+			goto yy1057;
+		} else {
+			if(yych <= 's')	goto yy1055;
+			if(yych <= 't')	goto yy1058;
+			goto yy777;
+=======
 			if(yych <= 'n')	goto yy1081;
 			if(yych <= 'q')	goto yy777;
 			goto yy1082;
@@ -14343,22 +18399,47 @@ yy1097:
 			if(yych <= 's')	goto yy1080;
 			if(yych <= 't')	goto yy1083;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1073:
+	YYDEBUG(1073, *YYCURSOR);
+=======
 yy1098:
 	YYDEBUG(1098, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'm'){
 		if(yych <= '9'){
+<<<<<<< parse_date.c
+			if(yych <= '/')	goto yy777;
+			goto yy1075;
+=======
 			if(yych <= '/')	goto yy777;
 			goto yy1100;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'T')	goto yy1059;
+			goto yy777;
+=======
 			if(yych == 'T')	goto yy1084;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1056;
+			if(yych <= 'q')	goto yy777;
+			goto yy1057;
+		} else {
+			if(yych <= 's')	goto yy1055;
+			if(yych <= 't')	goto yy1058;
+			goto yy777;
+=======
 			if(yych <= 'n')	goto yy1081;
 			if(yych <= 'q')	goto yy777;
 			goto yy1082;
@@ -14366,22 +18447,47 @@ yy1098:
 			if(yych <= 's')	goto yy1080;
 			if(yych <= 't')	goto yy1083;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1074:
+	YYDEBUG(1074, *YYCURSOR);
+=======
 yy1099:
 	YYDEBUG(1099, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 12;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'm'){
 		if(yych <= '1'){
+<<<<<<< parse_date.c
+			if(yych <= '/')	goto yy777;
+			goto yy1075;
+=======
 			if(yych <= '/')	goto yy777;
 			goto yy1100;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'T')	goto yy1059;
+			goto yy777;
+=======
 			if(yych == 'T')	goto yy1084;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1056;
+			if(yych <= 'q')	goto yy777;
+			goto yy1057;
+		} else {
+			if(yych <= 's')	goto yy1055;
+			if(yych <= 't')	goto yy1058;
+			goto yy777;
+=======
 			if(yych <= 'n')	goto yy1081;
 			if(yych <= 'q')	goto yy777;
 			goto yy1082;
@@ -14389,26 +18495,53 @@ yy1099:
 			if(yych <= 's')	goto yy1080;
 			if(yych <= 't')	goto yy1083;
 			goto yy777;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1075:
+	YYDEBUG(1075, *YYCURSOR);
+=======
 yy1100:
 	YYDEBUG(1100, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 18;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'n'){
+<<<<<<< parse_date.c
+		if(yych == 'T')	goto yy1076;
+		if(yych <= 'm')	goto yy1026;
+		goto yy1056;
+=======
 		if(yych == 'T')	goto yy1101;
 		if(yych <= 'm')	goto yy1051;
 		goto yy1081;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
+<<<<<<< parse_date.c
+			if(yych <= 'q')	goto yy1026;
+			goto yy1057;
+=======
 			if(yych <= 'q')	goto yy1051;
 			goto yy1082;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1055;
+			if(yych <= 't')	goto yy1058;
+			goto yy1026;
+=======
 			if(yych <= 's')	goto yy1080;
 			if(yych <= 't')	goto yy1083;
 			goto yy1051;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1076:
+	YYDEBUG(1076, *YYCURSOR);
+=======
 yy1101:
 	YYDEBUG(1101, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -14426,52 +18559,116 @@ yy1102:
 	goto yy53;
 yy1103:
 	YYDEBUG(1103, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '1')	goto yy1077;
+	if(yych <= '2')	goto yy1078;
+	if(yych <= '9')	goto yy1062;
+=======
 	if(yych <= '3')	goto yy1104;
 	if(yych == ':')	goto yy1088;
+>>>>>>> 1.55
 	goto yy53;
 yy1104:
 	YYDEBUG(1104, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '9')	goto yy1079;
+	if(yych <= ':')	goto yy1063;
+	goto yy53;
+yy1078:
+	YYDEBUG(1078, *YYCURSOR);
+=======
 	if(yych != ':')	goto yy53;
 	goto yy1105;
 yy1105:
 	YYDEBUG(1105, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '3')	goto yy1079;
+	if(yych == ':')	goto yy1063;
+=======
 	if(yych <= '5')	goto yy1106;
 	if(yych <= '9')	goto yy1090;
+>>>>>>> 1.55
 	goto yy53;
 yy1106:
 	YYDEBUG(1106, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != ':')	goto yy53;
+	goto yy1080;
+yy1080:
+	YYDEBUG(1080, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych <= '9')	goto yy1107;
 	if(yych <= ':')	goto yy1091;
 	goto yy53;
 yy1107:
 	YYDEBUG(1107, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy1081;
+	if(yych <= '9')	goto yy1065;
+	goto yy53;
+yy1081:
+	YYDEBUG(1081, *YYCURSOR);
+=======
 	if(yych != ':')	goto yy53;
 	goto yy1108;
 yy1108:
 	YYDEBUG(1108, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy1082;
+	if(yych <= ':')	goto yy1066;
+=======
 	if(yych <= '5')	goto yy1109;
 	if(yych <= '6')	goto yy1110;
 	if(yych <= '9')	goto yy944;
+>>>>>>> 1.55
 	goto yy53;
 yy1109:
 	YYDEBUG(1109, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != ':')	goto yy53;
+	goto yy1083;
+yy1083:
+	YYDEBUG(1083, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy945;
 	if(yych <= '9')	goto yy1111;
 	goto yy945;
 yy1110:
 	YYDEBUG(1110, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy1084;
+	if(yych <= '6')	goto yy1085;
+	if(yych <= '9')	goto yy934;
+	goto yy53;
+yy1084:
+	YYDEBUG(1084, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy935;
+	if(yych <= '9')	goto yy1086;
+	goto yy935;
+yy1085:
+	YYDEBUG(1085, *YYCURSOR);
+=======
 	if(yych != '0')	goto yy945;
 	goto yy1111;
 yy1111:
@@ -14482,13 +18679,52 @@ yy1111:
 	goto yy1112;
 yy1112:
 	YYDEBUG(1112, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych != '0')	goto yy935;
+	goto yy1086;
+yy1086:
+	YYDEBUG(1086, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy53;
 	if(yych >= ':')	goto yy53;
 	goto yy1113;
 yy1113:
 	YYDEBUG(1113, *YYCURSOR);
+>>>>>>> 1.55
+	yyaccept = 19;
+<<<<<<< parse_date.c
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych != '.')	goto yy935;
+	goto yy1087;
+yy1087:
+	YYDEBUG(1087, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych >= ':')	goto yy53;
+	goto yy1088;
+yy1088:
+	YYDEBUG(1088, *YYCURSOR);
 	yyaccept = 19;
+	YYMARKER = ++YYCURSOR;
+	if((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
+	yych = *YYCURSOR;
+	goto yy1089;
+yy1089:
+	YYDEBUG(1089, *YYCURSOR);
+	if(yych <= ','){
+		if(yych != '+')	goto yy935;
+		goto yy1090;
+	} else {
+		if(yych <= '-')	goto yy1090;
+		if(yych <= '/')	goto yy935;
+		if(yych <= '9')	goto yy1088;
+		goto yy935;
+	}
+yy1090:
+	YYDEBUG(1090, *YYCURSOR);
+=======
 	YYMARKER = ++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 6) YYFILL(6);
 	yych = *YYCURSOR;
@@ -14521,7 +18757,17 @@ yy1116:
 	goto yy945;
 yy1117:
 	YYDEBUG(1117, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy53;
+	if(yych <= '1')	goto yy1091;
+	if(yych <= '2')	goto yy1092;
+	if(yych <= '9')	goto yy1093;
+	goto yy53;
+yy1091:
+	YYDEBUG(1091, *YYCURSOR);
+=======
 	if(yych <= '5'){
 		if(yych <= '/')	goto yy945;
 		if(yych >= '4')	goto yy1120;
@@ -14533,7 +18779,16 @@ yy1117:
 	}
 yy1118:
 	YYDEBUG(1118, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy935;
+	if(yych <= '9')	goto yy1093;
+	if(yych <= ':')	goto yy1094;
+	goto yy935;
+yy1092:
+	YYDEBUG(1092, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy945;
 	if(yych <= '5')	goto yy1120;
 	if(yych <= '9')	goto yy944;
@@ -14541,20 +18796,59 @@ yy1118:
 	goto yy1119;
 yy1119:
 	YYDEBUG(1119, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '5'){
+		if(yych <= '/')	goto yy935;
+		if(yych >= '4')	goto yy1095;
+		goto yy1093;
+	} else {
+		if(yych <= '9')	goto yy934;
+		if(yych <= ':')	goto yy1094;
+		goto yy935;
+	}
+yy1093:
+	YYDEBUG(1093, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy945;
 	if(yych <= '5')	goto yy1120;
 	if(yych <= '9')	goto yy944;
 	goto yy945;
 yy1120:
 	YYDEBUG(1120, *YYCURSOR);
-	yych = *++YYCURSOR;
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy935;
+	if(yych <= '5')	goto yy1095;
+	if(yych <= '9')	goto yy934;
+	if(yych >= ';')	goto yy935;
+	goto yy1094;
+yy1094:
+	YYDEBUG(1094, *YYCURSOR);
+=======
 	if(yych <= '/')	goto yy945;
 	if(yych <= '9')	goto yy944;
 	goto yy945;
 yy1121:
 	YYDEBUG(1121, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych <= '/')	goto yy935;
+	if(yych <= '5')	goto yy1095;
+	if(yych <= '9')	goto yy934;
+	goto yy935;
+yy1095:
+	YYDEBUG(1095, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy935;
+	if(yych <= '9')	goto yy934;
+	goto yy935;
+yy1096:
+	YYDEBUG(1096, *YYCURSOR);
+=======
 	if(yych == 'C')	goto yy1122;
 	if(yych != 'c')	goto yy53;
 	goto yy1122;
@@ -14572,70 +18866,169 @@ yy1122:
 	}
 yy1123:
 	YYDEBUG(1123, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'C')	goto yy1097;
+	if(yych != 'c')	goto yy53;
+	goto yy1097;
+yy1097:
+	YYDEBUG(1097, *YYCURSOR);
+=======
 	if(yych == 'V')	goto yy1124;
 	if(yych != 'v')	goto yy53;
 	goto yy1124;
 yy1124:
 	YYDEBUG(1124, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'D'){
+<<<<<<< parse_date.c
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'E')	goto yy956;
+		if(yych == 'e')	goto yy956;
+		goto yy891;
+=======
 		if(yych <= 'E')	goto yy988;
 		if(yych == 'e')	goto yy988;
 		goto yy897;
+>>>>>>> 1.55
 	}
 yy1125:
 	YYDEBUG(1125, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'V')	goto yy1099;
+	if(yych != 'v')	goto yy53;
+	goto yy1099;
+yy1099:
+	YYDEBUG(1099, *YYCURSOR);
+=======
 	if(yych == 'T')	goto yy1126;
 	if(yych != 't')	goto yy53;
 	goto yy1126;
 yy1126:
 	YYDEBUG(1126, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'D'){
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 	if(yych <= 'N'){
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'E')	goto yy963;
+		if(yych == 'e')	goto yy963;
+		goto yy891;
+=======
 		if(yych <= 'O')	goto yy994;
 		if(yych == 'o')	goto yy994;
 		goto yy897;
+>>>>>>> 1.55
 	}
 yy1127:
 	YYDEBUG(1127, *YYCURSOR);
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'T')	goto yy1101;
+	if(yych != 't')	goto yy53;
+	goto yy1101;
+yy1101:
+	YYDEBUG(1101, *YYCURSOR);
+=======
 	if(yych == 'P')	goto yy1128;
 	if(yych != 'p')	goto yy53;
 	goto yy1128;
 yy1128:
 	YYDEBUG(1128, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'N'){
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 	if(yych <= 'S'){
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'O')	goto yy969;
+		if(yych == 'o')	goto yy969;
+		goto yy891;
+=======
 		if(yych <= 'T')	goto yy1129;
 		if(yych != 't')	goto yy897;
 		goto yy1129;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1102:
+	YYDEBUG(1102, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'P')	goto yy1103;
+	if(yych != 'p')	goto yy53;
+	goto yy1103;
+yy1103:
+	YYDEBUG(1103, *YYCURSOR);
+=======
 yy1129:
 	YYDEBUG(1129, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'S'){
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 	if(yych <= 'D'){
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'T')	goto yy1104;
+		if(yych != 't')	goto yy891;
+		goto yy1104;
+=======
 		if(yych <= 'E')	goto yy1000;
 		if(yych == 'e')	goto yy1000;
 		goto yy897;
+>>>>>>> 1.55
+	}
+<<<<<<< parse_date.c
+yy1104:
+	YYDEBUG(1104, *YYCURSOR);
+	yyaccept = 17;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= 'D'){
+		if(yych == '-')	goto yy865;
+		goto yy891;
+	} else {
+		if(yych <= 'E')	goto yy975;
+		if(yych == 'e')	goto yy975;
+		goto yy891;
 	}
+yy1105:
+	YYDEBUG(1105, *YYCURSOR);
+=======
 yy1130:
 	YYDEBUG(1130, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -14644,176 +19037,437 @@ yy1130:
 	goto yy53;
 yy1131:
 	YYDEBUG(1131, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'G')	goto yy1108;
+	if(yych == 'g')	goto yy1108;
+	goto yy53;
+yy1106:
+	YYDEBUG(1106, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych == 'R')	goto yy1107;
+=======
 	if(yych == 'R')	goto yy1132;
+>>>>>>> 1.55
 	if(yych != 'r')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1107;
+yy1107:
+	YYDEBUG(1107, *YYCURSOR);
+=======
 	goto yy1132;
 yy1132:
 	YYDEBUG(1132, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'H'){
+<<<<<<< parse_date.c
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'I')	goto yy982;
+		if(yych == 'i')	goto yy982;
+		goto yy891;
+=======
 		if(yych <= 'I')	goto yy1007;
 		if(yych == 'i')	goto yy1007;
 		goto yy897;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1108:
+	YYDEBUG(1108, *YYCURSOR);
+=======
 yy1133:
 	YYDEBUG(1133, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'T'){
+<<<<<<< parse_date.c
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'U')	goto yy984;
+		if(yych == 'u')	goto yy984;
+		goto yy891;
+=======
 		if(yych <= 'U')	goto yy1009;
 		if(yych == 'u')	goto yy1009;
 		goto yy897;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1109:
+	YYDEBUG(1109, *YYCURSOR);
+=======
 yy1134:
 	YYDEBUG(1134, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'Y'){
+<<<<<<< parse_date.c
+		if(yych == 'R')	goto yy1110;
+=======
 		if(yych == 'R')	goto yy1135;
+>>>>>>> 1.55
 		if(yych <= 'X')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy1111;
+=======
 		goto yy1136;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'r'){
 			if(yych <= 'q')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy1110;
+=======
 			goto yy1135;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'y')	goto yy1111;
+=======
 			if(yych == 'y')	goto yy1136;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy1110:
+	YYDEBUG(1110, *YYCURSOR);
+=======
 yy1135:
 	YYDEBUG(1135, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'B'){
+<<<<<<< parse_date.c
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'C')	goto yy988;
+		if(yych == 'c')	goto yy988;
+		goto yy891;
+=======
 		if(yych <= 'C')	goto yy1013;
 		if(yych == 'c')	goto yy1013;
 		goto yy897;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1111:
+	YYDEBUG(1111, *YYCURSOR);
+=======
 yy1136:
 	YYDEBUG(1136, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == '-')	goto yy865;
+	goto yy891;
+yy1112:
+	YYDEBUG(1112, *YYCURSOR);
+=======
 	if(yych == '-')	goto yy871;
 	goto yy897;
 yy1137:
 	YYDEBUG(1137, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy1113;
+=======
 	if(yych == 'B')	goto yy1138;
+>>>>>>> 1.55
 	if(yych != 'b')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1113;
+yy1113:
+	YYDEBUG(1113, *YYCURSOR);
+=======
 	goto yy1138;
 yy1138:
 	YYDEBUG(1138, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Q'){
+<<<<<<< parse_date.c
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'R')	goto yy991;
+		if(yych == 'r')	goto yy991;
+		goto yy891;
+=======
 		if(yych <= 'R')	goto yy1016;
 		if(yych == 'r')	goto yy1016;
 		goto yy897;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1114:
+	YYDEBUG(1114, *YYCURSOR);
+=======
 yy1139:
 	YYDEBUG(1139, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
+<<<<<<< parse_date.c
+		if(yych == 'L')	goto yy1118;
+=======
 		if(yych == 'L')	goto yy1143;
+>>>>>>> 1.55
 		if(yych <= 'M')	goto yy53;
+<<<<<<< parse_date.c
+		goto yy1117;
+=======
 		goto yy1142;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'l'){
 			if(yych <= 'k')	goto yy53;
+<<<<<<< parse_date.c
+			goto yy1118;
+=======
 			goto yy1143;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'n')	goto yy1117;
+=======
 			if(yych == 'n')	goto yy1142;
+>>>>>>> 1.55
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy1115:
+	YYDEBUG(1115, *YYCURSOR);
+=======
 yy1140:
 	YYDEBUG(1140, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'N')	goto yy1116;
+=======
 	if(yych == 'N')	goto yy1141;
+>>>>>>> 1.55
 	if(yych != 'n')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1116;
+yy1116:
+	YYDEBUG(1116, *YYCURSOR);
+=======
 	goto yy1141;
 yy1141:
 	YYDEBUG(1141, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'T'){
+<<<<<<< parse_date.c
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'U')	goto yy998;
+		if(yych == 'u')	goto yy998;
+		goto yy891;
+=======
 		if(yych <= 'U')	goto yy1023;
 		if(yych == 'u')	goto yy1023;
 		goto yy897;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1117:
+	YYDEBUG(1117, *YYCURSOR);
+=======
 yy1142:
 	YYDEBUG(1142, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'D'){
+<<<<<<< parse_date.c
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'E')	goto yy960;
+		if(yych == 'e')	goto yy960;
+		goto yy891;
+=======
 		if(yych <= 'E')	goto yy985;
 		if(yych == 'e')	goto yy985;
 		goto yy897;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1118:
+	YYDEBUG(1118, *YYCURSOR);
+=======
 yy1143:
 	YYDEBUG(1143, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 17;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'X'){
+<<<<<<< parse_date.c
+		if(yych == '-')	goto yy865;
+		goto yy891;
+=======
 		if(yych == '-')	goto yy871;
 		goto yy897;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'Y')	goto yy960;
+		if(yych == 'y')	goto yy960;
+		goto yy891;
+=======
 		if(yych <= 'Y')	goto yy985;
 		if(yych == 'y')	goto yy985;
 		goto yy897;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1119:
+	YYDEBUG(1119, *YYCURSOR);
+=======
 yy1144:
 	YYDEBUG(1144, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'T'){
+<<<<<<< parse_date.c
+		if(yych <= '-')	goto yy619;
+		if(yych <= '.')	goto yy847;
+		if(yych <= '/')	goto yy846;
+		goto yy619;
+=======
 		if(yych <= ',')	goto yy617;
 		if(yych <= '.')	goto yy848;
 		if(yych <= '/')	goto yy847;
 		goto yy617;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'U')	goto yy74;
 		if(yych == 'u')	goto yy74;
-		goto yy617;
+		goto yy619;
 	}
+<<<<<<< parse_date.c
+yy1120:
+	YYDEBUG(1120, *YYCURSOR);
+=======
 yy1145:
 	YYDEBUG(1145, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'P'){
 		if(yych == 'C')	goto yy121;
 		if(yych <= 'O')	goto yy53;
-		goto yy709;
+		goto yy711;
 	} else {
 		if(yych <= 'c'){
 			if(yych <= 'b')	goto yy53;
 			goto yy121;
 		} else {
-			if(yych == 'p')	goto yy709;
+			if(yych == 'p')	goto yy711;
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy1121:
+	YYDEBUG(1121, *YYCURSOR);
+=======
 yy1146:
 	YYDEBUG(1146, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	YYDEBUG(-1, yych);
+	switch(yych){
+	case ' ':	goto yy1122;
+	case '!':
+	case '"':
+	case '#':
+	case '$':
+	case '%':
+	case '&':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':	goto yy618;
+	case '-':	goto yy617;
+	case '.':	goto yy847;
+	case '/':	goto yy846;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy853;
+	case 'A':	case 'a':	goto yy701;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'S':	goto yy607;
+	case 'V':	goto yy623;
+	case 'X':	goto yy624;
+	case 'n':	goto yy614;
+	case 'r':	goto yy615;
+	case 's':	goto yy608;
+	case 't':	goto yy612;
+	default:	goto yy57;
+=======
 	if(yych <= 'm'){
 		if(yych <= '.'){
 			if(yych <= ',')	goto yy1148;
@@ -14834,18 +19488,35 @@ yy1146:
 			if(yych <= 't')	goto yy610;
 			goto yy1148;
 		}
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1122:
+	YYDEBUG(1122, *YYCURSOR);
+=======
 yy1147:
 	YYDEBUG(1147, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
 	if((YYLIMIT - YYCURSOR) < 13) YYFILL(13);
 	yych = *YYCURSOR;
+<<<<<<< parse_date.c
+	goto yy1123;
+yy1123:
+	YYDEBUG(1123, *YYCURSOR);
+=======
 	goto yy1148;
 yy1148:
 	YYDEBUG(1148, *YYCURSOR);
+>>>>>>> 1.55
 	YYDEBUG(-1, yych);
 	switch(yych){
+<<<<<<< parse_date.c
+	case 0x09:	goto yy56;
+	case ' ':	goto yy1122;
+=======
 	case ' ':	goto yy1147;
+>>>>>>> 1.55
 	case '!':
 	case '"':
 	case '#':
@@ -14859,27 +19530,79 @@ yy1148:
 	case '+':
 	case ',':
 	case '-':
-	case '.':	goto yy616;
-	case 'A':	case 'a':	goto yy699;
-	case 'D':	case 'd':	goto yy608;
-	case 'F':	case 'f':	goto yy609;
+	case '.':	goto yy618;
+	case 'A':	case 'a':	goto yy701;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
 	case 'H':	case 'h':	goto yy60;
-	case 'I':	goto yy619;
-	case 'J':	case 'j':	goto yy623;
-	case 'M':	case 'm':	goto yy607;
-	case 'N':	case 'n':	goto yy626;
-	case 'O':	case 'o':	goto yy625;
-	case 'S':	case 's':	goto yy605;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	case 'n':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'S':	case 's':	goto yy607;
 	case 'T':	case 't':	goto yy65;
-	case 'V':	goto yy621;
+	case 'V':	goto yy623;
 	case 'W':	case 'w':	goto yy62;
-	case 'X':	goto yy622;
+	case 'X':	goto yy624;
 	case 'Y':	case 'y':	goto yy64;
 	default:	goto yy53;
 	}
+<<<<<<< parse_date.c
+yy1124:
+	YYDEBUG(1124, *YYCURSOR);
+=======
 yy1149:
 	YYDEBUG(1149, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	YYDEBUG(-1, yych);
+	switch(yych){
+	case ' ':	goto yy1122;
+	case '!':
+	case '"':
+	case '#':
+	case '$':
+	case '%':
+	case '&':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':	goto yy618;
+	case '-':	goto yy617;
+	case '.':	goto yy1125;
+	case '/':	goto yy846;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':	goto yy1127;
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy853;
+	case ':':	goto yy1126;
+	case 'A':	case 'a':	goto yy701;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'S':	goto yy607;
+	case 'V':	goto yy623;
+	case 'X':	goto yy624;
+	case 'n':	goto yy614;
+	case 'r':	goto yy615;
+	case 's':	goto yy608;
+	case 't':	goto yy612;
+	default:	goto yy57;
+=======
 	if(yych <= ':'){
 		if(yych <= '.'){
 			if(yych <= ',')	goto yy1148;
@@ -14901,11 +19624,26 @@ yy1149:
 			if(yych <= 't')	goto yy610;
 			goto yy1148;
 		}
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1125:
+	YYDEBUG(1125, *YYCURSOR);
+=======
 yy1150:
 	YYDEBUG(1150, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '1'){
+<<<<<<< parse_date.c
+		if(yych <= '/')	goto yy619;
+		if(yych <= '0')	goto yy1149;
+		goto yy1150;
+	} else {
+		if(yych <= '5')	goto yy1151;
+		if(yych <= '9')	goto yy1152;
+		goto yy619;
+=======
 		if(yych <= '/')	goto yy617;
 		if(yych <= '0')	goto yy1174;
 		goto yy1175;
@@ -14913,28 +19651,55 @@ yy1150:
 		if(yych <= '5')	goto yy1176;
 		if(yych <= '9')	goto yy1177;
 		goto yy617;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1126:
+	YYDEBUG(1126, *YYCURSOR);
+=======
 yy1151:
 	YYDEBUG(1151, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy53;
+<<<<<<< parse_date.c
+	if(yych <= '5')	goto yy1144;
+	if(yych <= '9')	goto yy1145;
+=======
 	if(yych <= '5')	goto yy1169;
 	if(yych <= '9')	goto yy1170;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy1127:
+	YYDEBUG(1127, *YYCURSOR);
+=======
 yy1152:
 	YYDEBUG(1152, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == '-')	goto yy854;
+=======
 	if(yych == '-')	goto yy853;
+>>>>>>> 1.55
 	if(yych <= '/')	goto yy57;
 	if(yych >= ':')	goto yy57;
+<<<<<<< parse_date.c
+	goto yy1128;
+yy1128:
+	YYDEBUG(1128, *YYCURSOR);
+=======
 	goto yy1153;
 yy1153:
 	YYDEBUG(1153, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 20;
 	yych = *(YYMARKER = ++YYCURSOR);
 	YYDEBUG(-1, yych);
 	switch(yych){
-	case ' ':
+	case 0x09:	goto yy56;
+	case ' ':	goto yy885;
 	case '!':
 	case '"':
 	case '#':
@@ -14946,6 +19711,16 @@ yy1153:
 	case ')':
 	case '*':
 	case '+':
+<<<<<<< parse_date.c
+	case ',':	goto yy887;
+	case '-':	goto yy883;
+	case '.':	goto yy889;
+	case '/':	goto yy884;
+	case '0':	goto yy1130;
+	case '1':	goto yy1131;
+	case '2':	goto yy1132;
+	case '3':	goto yy1133;
+=======
 	case ',':	case 'A':	case 'D':	case 'F':	case 'H':
 	case 'I':
 	case 'J':	case 'M':
@@ -14963,18 +19738,49 @@ yy1153:
 	case '1':	goto yy1156;
 	case '2':	goto yy1157;
 	case '3':	goto yy1158;
+>>>>>>> 1.55
 	case '4':
+<<<<<<< parse_date.c
+	case '5':	goto yy1134;
+	case '6':	goto yy1135;
+=======
 	case '5':	goto yy1159;
 	case '6':	goto yy1160;
+>>>>>>> 1.55
 	case '7':
 	case '8':
 	case '9':	goto yy51;
+<<<<<<< parse_date.c
+	case 'A':	case 'a':	goto yy897;
+	case 'D':	case 'd':	goto yy901;
+	case 'F':	case 'f':	goto yy895;
+	case 'H':	case 'h':	goto yy60;
+	case 'I':	goto yy890;
+	case 'J':	case 'j':	goto yy894;
+	case 'M':	case 'm':	goto yy896;
+	case 'N':	case 'n':	goto yy900;
+	case 'O':	case 'o':	goto yy899;
+	case 'S':	case 's':	goto yy898;
+	case 'T':	case 't':	goto yy65;
+	case 'V':	goto yy892;
+	case 'W':	goto yy906;
+	case 'X':	goto yy893;
+	case 'Y':	case 'y':	goto yy64;
+	case 'w':	goto yy62;
+	default:	goto yy1129;
+=======
 	case ':':	goto yy910;
 	case 'W':	goto yy913;
 	default:	goto yy1154;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1129:
+	YYDEBUG(1129, *YYCURSOR);
+=======
 yy1154:
 	YYDEBUG(1154, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 970 "ext/date/lib/parse_date.re"
 {
@@ -14997,6 +19803,11 @@ yy1154:
 		TIMELIB_DEINIT;
 		return TIMELIB_GNU_NOCOLON;
 	}
+<<<<<<< parse_date.c
+#line 13076 "ext/date/lib/parse_date.c"
+yy1130:
+	YYDEBUG(1130, *YYCURSOR);
+=======
 #line 12662 "ext/date/lib/parse_date.c"
 yy1155:
 	YYDEBUG(1155, *YYCURSOR);
@@ -15014,38 +19825,95 @@ yy1156:
 	goto yy57;
 yy1157:
 	YYDEBUG(1157, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '0')	goto yy1142;
+	if(yych <= '9')	goto yy1143;
+=======
 	if(yych <= '9')	goto yy1165;
+>>>>>>> 1.55
 	goto yy57;
 yy1158:
 	YYDEBUG(1158, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '2')	goto yy1141;
+	if(yych <= '9')	goto yy1140;
+=======
 	if(yych <= '5')	goto yy1163;
 	if(yych <= '6')	goto yy1164;
 	if(yych <= '9')	goto yy1161;
+>>>>>>> 1.55
 	goto yy57;
 yy1159:
 	YYDEBUG(1159, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '9')	goto yy1140;
+=======
 	if(yych <= '9')	goto yy1161;
+>>>>>>> 1.55
 	goto yy57;
 yy1160:
 	YYDEBUG(1160, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if(yych <= '/')	goto yy57;
+<<<<<<< parse_date.c
+	if(yych <= '5')	goto yy1138;
+	if(yych <= '6')	goto yy1139;
+	if(yych <= '9')	goto yy1136;
+=======
 	if(yych <= '0')	goto yy1161;
 	if(yych <= '9')	goto yy51;
+>>>>>>> 1.55
+	goto yy57;
+<<<<<<< parse_date.c
+yy1134:
+	YYDEBUG(1134, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy57;
+	if(yych <= '9')	goto yy1136;
+	goto yy57;
+yy1135:
+	YYDEBUG(1135, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy57;
+	if(yych <= '0')	goto yy1136;
+	if(yych <= '9')	goto yy51;
 	goto yy57;
+yy1136:
+	YYDEBUG(1136, *YYCURSOR);
+=======
 yy1161:
 	YYDEBUG(1161, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if(yybm[0+yych] & 8) {
+	if(yybm[0+yych] & 4) {
 		goto yy51;
 	}
+<<<<<<< parse_date.c
+	if(yych <= 'W'){
+		if(yych <= 'F'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych >= ' ')	goto yy57;
+				goto yy1137;
+			} else {
+				if(yych == 'D')	goto yy57;
+				if(yych >= 'F')	goto yy57;
+				goto yy1137;
+			}
+		} else {
+			if(yych <= 'M'){
+				if(yych == 'H')	goto yy57;
+				if(yych >= 'M')	goto yy57;
+				goto yy1137;
+=======
 	if(yych <= 'X'){
 		if(yych <= 'G'){
 			if(yych <= 'C'){
@@ -15061,13 +19929,31 @@ yy1161:
 				if(yych <= 'H')	goto yy57;
 				if(yych == 'M')	goto yy57;
 				goto yy1162;
+>>>>>>> 1.55
 			} else {
+				if(yych <= 'R')	goto yy1137;
 				if(yych <= 'T')	goto yy57;
+<<<<<<< parse_date.c
+				if(yych >= 'W')	goto yy57;
+				goto yy1137;
+=======
 				if(yych == 'W')	goto yy57;
 				goto yy1162;
+>>>>>>> 1.55
 			}
 		}
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'h'){
+			if(yych <= 'd'){
+				if(yych == 'Y')	goto yy57;
+				if(yych >= 'd')	goto yy57;
+				goto yy1137;
+			} else {
+				if(yych == 'f')	goto yy57;
+				if(yych >= 'h')	goto yy57;
+				goto yy1137;
+=======
 		if(yych <= 'l'){
 			if(yych <= 'e'){
 				if(yych <= 'Y')	goto yy57;
@@ -15077,8 +19963,23 @@ yy1161:
 				if(yych == 'g')	goto yy1162;
 				if(yych <= 'h')	goto yy57;
 				goto yy1162;
+>>>>>>> 1.55
 			}
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych >= 's')	goto yy57;
+				goto yy1137;
+			} else {
+				if(yych <= 'w'){
+					if(yych >= 'w')	goto yy57;
+					goto yy1137;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy1137;
+				}
+=======
 			if(yych <= 'v'){
 				if(yych <= 'm')	goto yy57;
 				if(yych <= 'r')	goto yy1162;
@@ -15088,11 +19989,17 @@ yy1161:
 				if(yych == 'x')	goto yy1162;
 				if(yych <= 'y')	goto yy57;
 				goto yy1162;
+>>>>>>> 1.55
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1137:
+	YYDEBUG(1137, *YYCURSOR);
+=======
 yy1162:
 	YYDEBUG(1162, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 1015 "ext/date/lib/parse_date.re"
 {
@@ -15111,6 +20018,11 @@ yy1162:
 		TIMELIB_DEINIT;
 		return TIMELIB_ISO_NOCOLON;
 	}
+<<<<<<< parse_date.c
+#line 13179 "ext/date/lib/parse_date.c"
+yy1138:
+	YYDEBUG(1138, *YYCURSOR);
+=======
 #line 12760 "ext/date/lib/parse_date.c"
 yy1163:
 	YYDEBUG(1163, *YYCURSOR);
@@ -15156,8 +20068,69 @@ yy1164:
 	}
 yy1165:
 	YYDEBUG(1165, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= '/')	goto yy1137;
+				if(yych <= '9')	goto yy916;
+				if(yych <= 'C')	goto yy1137;
+				goto yy57;
+			}
+		} else {
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy57;
+				if(yych <= 'G')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych <= 'R')	goto yy1137;
+					if(yych <= 'T')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy1137;
+				if(yych <= 'Y')	goto yy57;
+				goto yy1137;
+			} else {
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy57;
+					goto yy1137;
+				} else {
+					if(yych == 'g')	goto yy1137;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych <= 'r')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
+=======
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
@@ -15174,11 +20147,76 @@ yy1165:
 	case '8':
 	case '9':	goto yy923;
 	default:	goto yy1162;
+>>>>>>> 1.55
 	}
 yy1166:
 	YYDEBUG(1166, *YYCURSOR);
 	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= '6'){
+					if(yych <= '/')	goto yy1137;
+					goto yy916;
+				} else {
+					if(yych <= '9')	goto yy51;
+					if(yych <= 'C')	goto yy1137;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy57;
+				if(yych <= 'G')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych <= 'R')	goto yy1137;
+					if(yych <= 'T')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy1137;
+				if(yych <= 'Y')	goto yy57;
+				goto yy1137;
+			} else {
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy57;
+					goto yy1137;
+				} else {
+					if(yych == 'g')	goto yy1137;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych <= 'r')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
+=======
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
@@ -15195,11 +20233,72 @@ yy1166:
 	case '8':
 	case '9':	goto yy923;
 	default:	goto yy1162;
+>>>>>>> 1.55
 	}
 yy1167:
 	YYDEBUG(1167, *YYCURSOR);
 	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= '/')	goto yy1137;
+				if(yych <= '9')	goto yy916;
+				if(yych <= 'C')	goto yy1137;
+				goto yy57;
+			}
+		} else {
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy57;
+				if(yych <= 'G')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych <= 'R')	goto yy1137;
+					if(yych <= 'T')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy1137;
+				if(yych <= 'Y')	goto yy57;
+				goto yy1137;
+			} else {
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy57;
+					goto yy1137;
+				} else {
+					if(yych == 'g')	goto yy1137;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych <= 'r')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
+=======
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
@@ -15216,11 +20315,228 @@ yy1167:
 	case '8':
 	case '9':	goto yy923;
 	default:	goto yy1162;
+>>>>>>> 1.55
+	}
+yy1168:
+	YYDEBUG(1168, *YYCURSOR);
+	yyaccept = 21;
+	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= 'T'){
+		if(yych <= '9'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= '0'){
+					if(yych <= '/')	goto yy1137;
+					goto yy920;
+				} else {
+					if(yych <= '2')	goto yy921;
+					if(yych <= '3')	goto yy922;
+					goto yy916;
+				}
+			}
+		} else {
+			if(yych <= 'G'){
+				if(yych <= 'D'){
+					if(yych <= 'C')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'F')	goto yy57;
+					goto yy1137;
+				}
+			} else {
+				if(yych <= 'L'){
+					if(yych <= 'H')	goto yy57;
+					goto yy1137;
+				} else {
+					if(yych <= 'M')	goto yy57;
+					if(yych <= 'R')	goto yy1137;
+					goto yy57;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'g'){
+			if(yych <= 'Y'){
+				if(yych == 'W')	goto yy57;
+				if(yych <= 'X')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'd'){
+					if(yych <= 'c')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'f')	goto yy57;
+					goto yy1137;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych <= 'l'){
+					if(yych <= 'h')	goto yy57;
+					goto yy1137;
+				} else {
+					if(yych <= 'm')	goto yy57;
+					if(yych <= 'r')	goto yy1137;
+					goto yy57;
+				}
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
 	}
-yy1168:
-	YYDEBUG(1168, *YYCURSOR);
+yy1142:
+	YYDEBUG(1142, *YYCURSOR);
+	yyaccept = 21;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= 'V'){
+		if(yych <= 'D'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= '0'){
+					if(yych <= '/')	goto yy1137;
+					goto yy51;
+				} else {
+					if(yych <= '9')	goto yy916;
+					if(yych <= 'C')	goto yy1137;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 'H'){
+				if(yych == 'F')	goto yy57;
+				if(yych <= 'G')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'M'){
+					if(yych <= 'L')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych <= 'R')	goto yy1137;
+					if(yych <= 'T')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'h'){
+			if(yych <= 'c'){
+				if(yych == 'X')	goto yy1137;
+				if(yych <= 'Y')	goto yy57;
+				goto yy1137;
+			} else {
+				if(yych <= 'e'){
+					if(yych <= 'd')	goto yy57;
+					goto yy1137;
+				} else {
+					if(yych == 'g')	goto yy1137;
+					goto yy57;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych == 'm')	goto yy57;
+				if(yych <= 'r')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
+	}
+yy1143:
+	YYDEBUG(1143, *YYCURSOR);
 	yyaccept = 21;
 	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= 'T'){
+		if(yych <= '9'){
+			if(yych <= ' '){
+				if(yych == 0x09)	goto yy57;
+				if(yych <= 0x1F)	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= '0'){
+					if(yych <= '/')	goto yy1137;
+					goto yy920;
+				} else {
+					if(yych <= '2')	goto yy921;
+					if(yych <= '3')	goto yy922;
+					goto yy916;
+				}
+			}
+		} else {
+			if(yych <= 'G'){
+				if(yych <= 'D'){
+					if(yych <= 'C')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'F')	goto yy57;
+					goto yy1137;
+				}
+			} else {
+				if(yych <= 'L'){
+					if(yych <= 'H')	goto yy57;
+					goto yy1137;
+				} else {
+					if(yych <= 'M')	goto yy57;
+					if(yych <= 'R')	goto yy1137;
+					goto yy57;
+				}
+			}
+		}
+	} else {
+		if(yych <= 'g'){
+			if(yych <= 'Y'){
+				if(yych == 'W')	goto yy57;
+				if(yych <= 'X')	goto yy1137;
+				goto yy57;
+			} else {
+				if(yych <= 'd'){
+					if(yych <= 'c')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'f')	goto yy57;
+					goto yy1137;
+				}
+			}
+		} else {
+			if(yych <= 't'){
+				if(yych <= 'l'){
+					if(yych <= 'h')	goto yy57;
+					goto yy1137;
+				} else {
+					if(yych <= 'm')	goto yy57;
+					if(yych <= 'r')	goto yy1137;
+					goto yy57;
+				}
+			} else {
+				if(yych <= 'w'){
+					if(yych <= 'v')	goto yy1137;
+					goto yy57;
+				} else {
+					if(yych == 'y')	goto yy57;
+					goto yy1137;
+				}
+			}
+		}
+=======
 	YYDEBUG(-1, yych);
 	switch(yych){
 	case ' ':	case 'D':	case 'F':	case 'H':	case 'M':	case 'S':
@@ -15237,19 +20553,40 @@ yy1168:
 	case '8':
 	case '9':	goto yy923;
 	default:	goto yy1162;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1144:
+	YYDEBUG(1144, *YYCURSOR);
+=======
 yy1169:
 	YYDEBUG(1169, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
+<<<<<<< parse_date.c
+		if(yych == '.')	goto yy1146;
+		goto yy636;
+=======
 		if(yych == '.')	goto yy1171;
 		goto yy634;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= '9')	goto yy1145;
+		if(yych <= ':')	goto yy1146;
+		goto yy636;
+=======
 		if(yych <= '9')	goto yy1170;
 		if(yych <= ':')	goto yy1171;
 		goto yy634;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1145:
+	YYDEBUG(1145, *YYCURSOR);
+=======
 yy1170:
 	YYDEBUG(1170, *YYCURSOR);
 	yyaccept = 11;
@@ -15267,8 +20604,24 @@ yy1171:
 	goto yy53;
 yy1172:
 	YYDEBUG(1172, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == '.')	goto yy1146;
+	if(yych != ':')	goto yy636;
+	goto yy1146;
+yy1146:
+	YYDEBUG(1146, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy1147;
+	if(yych <= '6')	goto yy1148;
+	if(yych <= '9')	goto yy641;
+	goto yy53;
+yy1147:
+	YYDEBUG(1147, *YYCURSOR);
+=======
 	if(yych == '.')	goto yy640;
 	if(yych <= '/')	goto yy634;
 	if(yych <= '9')	goto yy639;
@@ -15282,8 +20635,17 @@ yy1173:
 	goto yy634;
 yy1174:
 	YYDEBUG(1174, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == '.')	goto yy642;
+	if(yych <= '/')	goto yy636;
+	if(yych <= '9')	goto yy641;
+	goto yy636;
+yy1148:
+	YYDEBUG(1148, *YYCURSOR);
+=======
 	if(yych <= '.'){
 		if(yych <= ',')	goto yy634;
 		if(yych <= '-')	goto yy724;
@@ -15296,8 +20658,16 @@ yy1174:
 	}
 yy1175:
 	YYDEBUG(1175, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == '.')	goto yy642;
+	if(yych == '0')	goto yy641;
+	goto yy636;
+yy1149:
+	YYDEBUG(1149, *YYCURSOR);
+=======
 	if(yych <= '/'){
 		if(yych <= ',')	goto yy634;
 		if(yych <= '-')	goto yy724;
@@ -15311,8 +20681,14 @@ yy1175:
 	}
 yy1176:
 	YYDEBUG(1176, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych <= '/'){
+		if(yych == '.')	goto yy1153;
+		goto yy636;
+=======
 	if(yych <= '.'){
 		if(yych <= ',')	goto yy634;
 		if(yych <= '-')	goto yy724;
@@ -15331,10 +20707,46 @@ yy1177:
 		if(yych <= ',')	goto yy634;
 		if(yych <= '-')	goto yy724;
 		goto yy1178;
+>>>>>>> 1.55
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= '9')	goto yy1152;
+		if(yych <= ':')	goto yy1146;
+		goto yy636;
+=======
 		if(yych == ':')	goto yy1171;
 		goto yy634;
+>>>>>>> 1.55
+	}
+<<<<<<< parse_date.c
+yy1150:
+	YYDEBUG(1150, *YYCURSOR);
+	yyaccept = 11;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= '/'){
+		if(yych == '.')	goto yy1153;
+		goto yy636;
+	} else {
+		if(yych <= '2')	goto yy1152;
+		if(yych <= '9')	goto yy1145;
+		if(yych <= ':')	goto yy1146;
+		goto yy636;
+	}
+yy1151:
+	YYDEBUG(1151, *YYCURSOR);
+	yyaccept = 11;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= '/'){
+		if(yych == '.')	goto yy1153;
+		goto yy636;
+	} else {
+		if(yych <= '9')	goto yy1145;
+		if(yych <= ':')	goto yy1146;
+		goto yy636;
 	}
+yy1152:
+	YYDEBUG(1152, *YYCURSOR);
+=======
 yy1178:
 	YYDEBUG(1178, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -15345,8 +20757,24 @@ yy1178:
 	goto yy53;
 yy1179:
 	YYDEBUG(1179, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == '.')	goto yy1153;
+	if(yych == ':')	goto yy1146;
+	goto yy636;
+yy1153:
+	YYDEBUG(1153, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych <= '/')	goto yy53;
+	if(yych <= '5')	goto yy1154;
+	if(yych <= '6')	goto yy1155;
+	if(yych <= '9')	goto yy729;
+	goto yy53;
+yy1154:
+	YYDEBUG(1154, *YYCURSOR);
+=======
 	if(yych == '.')	goto yy640;
 	if(yych <= '/')	goto yy634;
 	if(yych <= '9')	goto yy1181;
@@ -15365,8 +20793,22 @@ yy1180:
 	}
 yy1181:
 	YYDEBUG(1181, *YYCURSOR);
+>>>>>>> 1.55
+	yyaccept = 11;
+	yych = *(YYMARKER = ++YYCURSOR);
+<<<<<<< parse_date.c
+	if(yych == '.')	goto yy642;
+	if(yych <= '/')	goto yy636;
+	if(yych <= '9')	goto yy1156;
+	goto yy636;
+yy1155:
+	YYDEBUG(1155, *YYCURSOR);
 	yyaccept = 11;
 	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych <= '/'){
+		if(yych == '.')	goto yy642;
+		goto yy636;
+=======
 	if(yych == '.')	goto yy640;
 	if(yych <= '/')	goto yy634;
 	if(yych <= '9')	goto yy731;
@@ -15385,17 +20827,24 @@ yy1182:
 			if(yych <= '9')	goto yy852;
 			goto yy627;
 		}
+>>>>>>> 1.55
 	} else {
-		if(yych <= 'q'){
-			if(yych == 'n')	goto yy612;
-			goto yy604;
-		} else {
-			if(yych <= 'r')	goto yy613;
-			if(yych <= 's')	goto yy606;
-			if(yych <= 't')	goto yy610;
-			goto yy604;
-		}
+		if(yych <= '0')	goto yy1156;
+		if(yych <= '9')	goto yy730;
+		goto yy636;
 	}
+<<<<<<< parse_date.c
+yy1156:
+	YYDEBUG(1156, *YYCURSOR);
+	yyaccept = 11;
+	yych = *(YYMARKER = ++YYCURSOR);
+	if(yych == '.')	goto yy642;
+	if(yych <= '/')	goto yy636;
+	if(yych <= '9')	goto yy732;
+	goto yy636;
+yy1157:
+	YYDEBUG(1157, *YYCURSOR);
+=======
 yy1183:
 	YYDEBUG(1183, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -15423,7 +20872,124 @@ yy1183:
 	}
 yy1184:
 	YYDEBUG(1184, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	YYDEBUG(-1, yych);
+	switch(yych){
+	case ' ':	goto yy605;
+	case '!':
+	case '"':
+	case '#':
+	case '$':
+	case '%':
+	case '&':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':	goto yy618;
+	case '-':	goto yy617;
+	case '.':	goto yy620;
+	case '/':	goto yy616;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':	goto yy1127;
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy853;
+	case ':':	goto yy629;
+	case 'A':	case 'a':	goto yy626;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'S':	goto yy607;
+	case 'V':	goto yy623;
+	case 'X':	goto yy624;
+	case 'n':	goto yy614;
+	case 'r':	goto yy615;
+	case 's':	goto yy608;
+	case 't':	goto yy612;
+	default:	goto yy604;
+	}
+yy1158:
+	YYDEBUG(1158, *YYCURSOR);
+	yych = *++YYCURSOR;
+	YYDEBUG(-1, yych);
+	switch(yych){
+	case ' ':	goto yy1122;
+	case '!':
+	case '"':
+	case '#':
+	case '$':
+	case '%':
+	case '&':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':	goto yy618;
+	case '-':	goto yy617;
+	case '.':	goto yy1125;
+	case '/':	goto yy616;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':	goto yy1127;
+	case '6':
+	case '7':
+	case '8':
+	case '9':	goto yy853;
+	case ':':	goto yy1126;
+	case 'A':	case 'a':	goto yy701;
+	case 'D':	case 'd':	goto yy610;
+	case 'F':	case 'f':	goto yy611;
+	case 'I':	goto yy621;
+	case 'J':	case 'j':	goto yy625;
+	case 'M':	case 'm':	goto yy609;
+	case 'N':	goto yy628;
+	case 'O':	case 'o':	goto yy627;
+	case 'S':	goto yy607;
+	case 'V':	goto yy623;
+	case 'X':	goto yy624;
+	case 'n':	goto yy614;
+	case 'r':	goto yy615;
+	case 's':	goto yy608;
+	case 't':	goto yy612;
+	default:	goto yy57;
+	}
+yy1159:
+	YYDEBUG(1159, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych <= '0')	goto yy53;
+	if(yych >= ':')	goto yy53;
+	goto yy1160;
+yy1160:
+	YYDEBUG(1160, *YYCURSOR);
+	++YYCURSOR;
+	if(YYLIMIT == YYCURSOR) YYFILL(1);
+	yych = *YYCURSOR;
+	goto yy1161;
+yy1161:
+	YYDEBUG(1161, *YYCURSOR);
+	if(yych <= '/')	goto yy1162;
+	if(yych <= '9')	goto yy1160;
+	goto yy1162;
+yy1162:
+	YYDEBUG(1162, *YYCURSOR);
+=======
 	if(yych <= '0')	goto yy53;
 	if(yych >= ':')	goto yy53;
 	goto yy1185;
@@ -15440,6 +21006,7 @@ yy1186:
 	goto yy1187;
 yy1187:
 	YYDEBUG(1187, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 905 "ext/date/lib/parse_date.re"
 {
@@ -15464,9 +21031,15 @@ yy1187:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
+<<<<<<< parse_date.c
+#line 13803 "ext/date/lib/parse_date.c"
+yy1163:
+	YYDEBUG(1163, *YYCURSOR);
+=======
 #line 13057 "ext/date/lib/parse_date.c"
 yy1188:
 	YYDEBUG(1188, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
 		if(yych <= ')'){
@@ -15475,7 +21048,11 @@ yy1188:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1194;
+=======
 			goto yy1219;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'm'){
@@ -15483,61 +21060,112 @@ yy1188:
 			if(yych <= '`')	goto yy3;
 			goto yy134;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1194;
+=======
 			if(yych <= 'n')	goto yy1219;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1164:
+	YYDEBUG(1164, *YYCURSOR);
+=======
 yy1189:
 	YYDEBUG(1189, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'U'){
 		if(yych <= '@'){
 			if(yych == ')')	goto yy132;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'I')	goto yy1188;
+=======
 			if(yych == 'I')	goto yy1213;
+>>>>>>> 1.55
 			if(yych <= 'T')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1187;
+=======
 			goto yy1212;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'i'){
 			if(yych <= 'Z')	goto yy134;
 			if(yych <= '`')	goto yy3;
 			if(yych <= 'h')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1188;
+=======
 			goto yy1213;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'u')	goto yy1187;
+=======
 			if(yych == 'u')	goto yy1212;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1165:
+	YYDEBUG(1165, *YYCURSOR);
+=======
 yy1190:
 	YYDEBUG(1190, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'M'){
 		if(yych <= '@'){
 			if(yych == ')')	goto yy132;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'D')	goto yy1176;
+=======
 			if(yych == 'D')	goto yy1201;
+>>>>>>> 1.55
 			if(yych <= 'L')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1177;
+=======
 			goto yy1202;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'd'){
 			if(yych <= 'Z')	goto yy134;
 			if(yych <= '`')	goto yy3;
 			if(yych <= 'c')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1176;
+=======
 			goto yy1201;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'm')	goto yy1177;
+=======
 			if(yych == 'm')	goto yy1202;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1166:
+	YYDEBUG(1166, *YYCURSOR);
+=======
 yy1191:
 	YYDEBUG(1191, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'E'){
 		if(yych <= ')'){
@@ -15546,7 +21174,11 @@ yy1191:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'D')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1172;
+=======
 			goto yy1197;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'd'){
@@ -15554,13 +21186,22 @@ yy1191:
 			if(yych <= '`')	goto yy3;
 			goto yy134;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'e')	goto yy1172;
+=======
 			if(yych <= 'e')	goto yy1197;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1167:
+	YYDEBUG(1167, *YYCURSOR);
+=======
 yy1192:
 	YYDEBUG(1192, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'E'){
 		if(yych <= ')'){
@@ -15569,7 +21210,11 @@ yy1192:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'D')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1168;
+=======
 			goto yy1193;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'd'){
@@ -15577,13 +21222,22 @@ yy1192:
 			if(yych <= '`')	goto yy3;
 			goto yy134;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'e')	goto yy1168;
+=======
 			if(yych <= 'e')	goto yy1193;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1168:
+	YYDEBUG(1168, *YYCURSOR);
+=======
 yy1193:
 	YYDEBUG(1193, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'L'){
 		if(yych <= ')'){
@@ -15592,7 +21246,11 @@ yy1193:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'K')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1169;
+=======
 			goto yy1194;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'k'){
@@ -15600,37 +21258,74 @@ yy1193:
 			if(yych <= '`')	goto yy3;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'l')	goto yy1169;
+=======
 			if(yych <= 'l')	goto yy1194;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1169:
+	YYDEBUG(1169, *YYCURSOR);
+=======
 yy1194:
 	YYDEBUG(1194, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'E'){
 		if(yych == ')')	goto yy132;
 		goto yy3;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'F')	goto yy1170;
+=======
 		if(yych <= 'F')	goto yy1195;
+>>>>>>> 1.55
 		if(yych != 'f')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1170;
+=======
 		goto yy1195;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1170:
+	YYDEBUG(1170, *YYCURSOR);
+=======
 yy1195:
 	YYDEBUG(1195, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'T')	goto yy1171;
+=======
 	if(yych == 'T')	goto yy1196;
+>>>>>>> 1.55
 	if(yych != 't')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1171;
+yy1171:
+	YYDEBUG(1171, *YYCURSOR);
+=======
 	goto yy1196;
 yy1196:
 	YYDEBUG(1196, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych == 'H')	goto yy159;
 	if(yych == 'h')	goto yy159;
 	goto yy53;
+<<<<<<< parse_date.c
+yy1172:
+	YYDEBUG(1172, *YYCURSOR);
+=======
 yy1197:
 	YYDEBUG(1197, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'S'){
 		if(yych <= ')'){
@@ -15639,7 +21334,11 @@ yy1197:
 		} else {
 			if(yych <= '@')	goto yy341;
 			if(yych <= 'R')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1173;
+=======
 			goto yy1198;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
@@ -15647,54 +21346,104 @@ yy1197:
 			if(yych <= '`')	goto yy341;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1173;
+=======
 			if(yych <= 's')	goto yy1198;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy341;
 		}
 	}
+<<<<<<< parse_date.c
+yy1173:
+	YYDEBUG(1173, *YYCURSOR);
+=======
 yy1198:
 	YYDEBUG(1198, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'C'){
 		if(yych == ')')	goto yy132;
 		goto yy3;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'D')	goto yy1174;
+=======
 		if(yych <= 'D')	goto yy1199;
+>>>>>>> 1.55
 		if(yych != 'd')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1174;
+=======
 		goto yy1199;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1174:
+	YYDEBUG(1174, *YYCURSOR);
+=======
 yy1199:
 	YYDEBUG(1199, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy1175;
+=======
 	if(yych == 'A')	goto yy1200;
+>>>>>>> 1.55
 	if(yych != 'a')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1175;
+yy1175:
+	YYDEBUG(1175, *YYCURSOR);
+=======
 	goto yy1200;
 yy1200:
 	YYDEBUG(1200, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych == 'Y')	goto yy347;
 	if(yych == 'y')	goto yy347;
 	goto yy53;
+<<<<<<< parse_date.c
+yy1176:
+	YYDEBUG(1176, *YYCURSOR);
+=======
 yy1201:
 	YYDEBUG(1201, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'A'){
 		if(yych == ')')	goto yy132;
 		if(yych <= '@')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1184;
+=======
 		goto yy1209;
+>>>>>>> 1.55
 	} else {
 		if(yych <= '`'){
 			if(yych <= 'Z')	goto yy135;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'a')	goto yy1184;
+=======
 			if(yych <= 'a')	goto yy1209;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1177:
+	YYDEBUG(1177, *YYCURSOR);
+=======
 yy1202:
 	YYDEBUG(1202, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'O'){
 		if(yych <= ')'){
@@ -15703,7 +21452,11 @@ yy1202:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'N')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1178;
+=======
 			goto yy1203;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'n'){
@@ -15711,23 +21464,44 @@ yy1202:
 			if(yych <= '`')	goto yy3;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'o')	goto yy1178;
+=======
 			if(yych <= 'o')	goto yy1203;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1178:
+	YYDEBUG(1178, *YYCURSOR);
+=======
 yy1203:
 	YYDEBUG(1203, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Q'){
 		if(yych == ')')	goto yy132;
 		goto yy3;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'R')	goto yy1179;
+=======
 		if(yych <= 'R')	goto yy1204;
+>>>>>>> 1.55
 		if(yych != 'r')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1179;
+=======
 		goto yy1204;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1179:
+	YYDEBUG(1179, *YYCURSOR);
+=======
 yy1204:
 	YYDEBUG(1204, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -15742,7 +21516,31 @@ yy1205:
 	goto yy1206;
 yy1206:
 	YYDEBUG(1206, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'R')	goto yy1180;
+	if(yych != 'r')	goto yy53;
+	goto yy1180;
+yy1180:
+	YYDEBUG(1180, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych == 'O')	goto yy1181;
+	if(yych != 'o')	goto yy53;
+	goto yy1181;
+yy1181:
+	YYDEBUG(1181, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'W')	goto yy1182;
+	if(yych != 'w')	goto yy53;
+	goto yy1182;
+yy1182:
+	YYDEBUG(1182, *YYCURSOR);
+	++YYCURSOR;
+	goto yy1183;
+yy1183:
+	YYDEBUG(1183, *YYCURSOR);
+=======
 	if(yych == 'W')	goto yy1207;
 	if(yych != 'w')	goto yy53;
 	goto yy1207;
@@ -15752,6 +21550,7 @@ yy1207:
 	goto yy1208;
 yy1208:
 	YYDEBUG(1208, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 893 "ext/date/lib/parse_date.re"
 {
@@ -15764,24 +21563,49 @@ yy1208:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
+<<<<<<< parse_date.c
+#line 14061 "ext/date/lib/parse_date.c"
+yy1184:
+	YYDEBUG(1184, *YYCURSOR);
+=======
 #line 13315 "ext/date/lib/parse_date.c"
 yy1209:
 	YYDEBUG(1209, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'X'){
 		if(yych == ')')	goto yy132;
 		goto yy3;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'Y')	goto yy1185;
+=======
 		if(yych <= 'Y')	goto yy1210;
+>>>>>>> 1.55
 		if(yych != 'y')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1185;
+=======
 		goto yy1210;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1185:
+	YYDEBUG(1185, *YYCURSOR);
+=======
 yy1210:
 	YYDEBUG(1210, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
+<<<<<<< parse_date.c
+	goto yy1186;
+yy1186:
+	YYDEBUG(1186, *YYCURSOR);
+=======
 	goto yy1211;
 yy1211:
 	YYDEBUG(1211, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 883 "ext/date/lib/parse_date.re"
 {
@@ -15792,9 +21616,15 @@ yy1211:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
+<<<<<<< parse_date.c
+#line 14083 "ext/date/lib/parse_date.c"
+yy1187:
+	YYDEBUG(1187, *YYCURSOR);
+=======
 #line 13337 "ext/date/lib/parse_date.c"
 yy1212:
 	YYDEBUG(1212, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'R'){
 		if(yych <= ')'){
@@ -15803,7 +21633,11 @@ yy1212:
 		} else {
 			if(yych <= '@')	goto yy341;
 			if(yych <= 'Q')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1190;
+=======
 			goto yy1215;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'q'){
@@ -15811,13 +21645,22 @@ yy1212:
 			if(yych <= '`')	goto yy341;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'r')	goto yy1190;
+=======
 			if(yych <= 'r')	goto yy1215;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy341;
 		}
 	}
+<<<<<<< parse_date.c
+yy1188:
+	YYDEBUG(1188, *YYCURSOR);
+=======
 yy1213:
 	YYDEBUG(1213, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'S'){
 		if(yych <= '@'){
@@ -15826,7 +21669,11 @@ yy1213:
 		} else {
 			if(yych <= 'Q')	goto yy135;
 			if(yych >= 'S')	goto yy317;
+<<<<<<< parse_date.c
+			goto yy1189;
+=======
 			goto yy1214;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'q'){
@@ -15834,14 +21681,23 @@ yy1213:
 			if(yych <= '`')	goto yy3;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'r')	goto yy1189;
+=======
 			if(yych <= 'r')	goto yy1214;
+>>>>>>> 1.55
 			if(yych <= 's')	goto yy317;
 			if(yych <= 'z')	goto yy135;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1189:
+	YYDEBUG(1189, *YYCURSOR);
+=======
 yy1214:
 	YYDEBUG(1214, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'C'){
@@ -15852,38 +21708,81 @@ yy1214:
 		if(yych == 'd')	goto yy159;
 		goto yy3;
 	}
+<<<<<<< parse_date.c
+yy1190:
+	YYDEBUG(1190, *YYCURSOR);
+=======
 yy1215:
 	YYDEBUG(1215, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'R'){
 		if(yych == ')')	goto yy132;
 		goto yy3;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'S')	goto yy1191;
+=======
 		if(yych <= 'S')	goto yy1216;
+>>>>>>> 1.55
 		if(yych != 's')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1191;
+=======
 		goto yy1216;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1191:
+	YYDEBUG(1191, *YYCURSOR);
+=======
 yy1216:
 	YYDEBUG(1216, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'D')	goto yy1192;
+=======
 	if(yych == 'D')	goto yy1217;
+>>>>>>> 1.55
 	if(yych != 'd')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1192;
+yy1192:
+	YYDEBUG(1192, *YYCURSOR);
+=======
 	goto yy1217;
 yy1217:
 	YYDEBUG(1217, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy1193;
+=======
 	if(yych == 'A')	goto yy1218;
+>>>>>>> 1.55
 	if(yych != 'a')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1193;
+yy1193:
+	YYDEBUG(1193, *YYCURSOR);
+=======
 	goto yy1218;
 yy1218:
 	YYDEBUG(1218, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych == 'Y')	goto yy347;
 	if(yych == 'y')	goto yy347;
 	goto yy53;
+<<<<<<< parse_date.c
+yy1194:
+	YYDEBUG(1194, *YYCURSOR);
+=======
 yy1219:
 	YYDEBUG(1219, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'T'){
 		if(yych <= ')'){
@@ -15892,7 +21791,11 @@ yy1219:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'S')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1195;
+=======
 			goto yy1220;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 's'){
@@ -15900,13 +21803,22 @@ yy1219:
 			if(yych <= '`')	goto yy3;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 't')	goto yy1195;
+=======
 			if(yych <= 't')	goto yy1220;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1195:
+	YYDEBUG(1195, *YYCURSOR);
+=======
 yy1220:
 	YYDEBUG(1220, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'G'){
@@ -15917,8 +21829,13 @@ yy1220:
 		if(yych == 'h')	goto yy159;
 		goto yy3;
 	}
+<<<<<<< parse_date.c
+yy1196:
+	YYDEBUG(1196, *YYCURSOR);
+=======
 yy1221:
 	YYDEBUG(1221, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'N'){
@@ -15929,7 +21846,11 @@ yy1221:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1194;
+=======
 			goto yy1219;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -15937,13 +21858,22 @@ yy1221:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'n')	goto yy1225;
+=======
 			if(yych == 'n')	goto yy1250;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy137;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1197:
+	YYDEBUG(1197, *YYCURSOR);
+=======
 yy1222:
 	YYDEBUG(1222, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'U'){
@@ -15956,9 +21886,17 @@ yy1222:
 				if(yych <= '@')	goto yy3;
 				goto yy134;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'I')	goto yy1188;
+=======
 				if(yych <= 'I')	goto yy1213;
+>>>>>>> 1.55
 				if(yych <= 'T')	goto yy134;
+<<<<<<< parse_date.c
+				goto yy1187;
+=======
 				goto yy1212;
+>>>>>>> 1.55
 			}
 		}
 	} else {
@@ -15973,17 +21911,30 @@ yy1222:
 			}
 		} else {
 			if(yych <= 't'){
+<<<<<<< parse_date.c
+				if(yych <= 'i')	goto yy1219;
+=======
 				if(yych <= 'i')	goto yy1244;
+>>>>>>> 1.55
 				goto yy137;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'u')	goto yy1218;
+=======
 				if(yych <= 'u')	goto yy1243;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy137;
 				goto yy3;
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1198:
+	YYDEBUG(1198, *YYCURSOR);
+=======
 yy1223:
 	YYDEBUG(1223, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'M'){
@@ -15996,9 +21947,17 @@ yy1223:
 				if(yych <= '@')	goto yy3;
 				goto yy134;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'D')	goto yy1176;
+=======
 				if(yych <= 'D')	goto yy1201;
+>>>>>>> 1.55
 				if(yych <= 'L')	goto yy134;
+<<<<<<< parse_date.c
+				goto yy1177;
+=======
 				goto yy1202;
+>>>>>>> 1.55
 			}
 		}
 	} else {
@@ -16013,17 +21972,30 @@ yy1223:
 			}
 		} else {
 			if(yych <= 'l'){
+<<<<<<< parse_date.c
+				if(yych <= 'd')	goto yy1209;
+=======
 				if(yych <= 'd')	goto yy1234;
+>>>>>>> 1.55
 				goto yy137;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'm')	goto yy1210;
+=======
 				if(yych <= 'm')	goto yy1235;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy137;
 				goto yy3;
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1199:
+	YYDEBUG(1199, *YYCURSOR);
+=======
 yy1224:
 	YYDEBUG(1224, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'E'){
@@ -16034,7 +22006,11 @@ yy1224:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'D')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1172;
+=======
 			goto yy1197;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16042,13 +22018,22 @@ yy1224:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'e')	goto yy1205;
+=======
 			if(yych == 'e')	goto yy1230;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy137;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1200:
+	YYDEBUG(1200, *YYCURSOR);
+=======
 yy1225:
 	YYDEBUG(1225, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'E'){
@@ -16059,7 +22044,11 @@ yy1225:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'D')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1168;
+=======
 			goto yy1193;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16067,13 +22056,22 @@ yy1225:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'e')	goto yy1201;
+=======
 			if(yych == 'e')	goto yy1226;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy137;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1201:
+	YYDEBUG(1201, *YYCURSOR);
+=======
 yy1226:
 	YYDEBUG(1226, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'L'){
@@ -16084,7 +22082,11 @@ yy1226:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'K')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1169;
+=======
 			goto yy1194;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16092,13 +22094,22 @@ yy1226:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'l')	goto yy1202;
+=======
 			if(yych == 'l')	goto yy1227;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1202:
+	YYDEBUG(1202, *YYCURSOR);
+=======
 yy1227:
 	YYDEBUG(1227, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'F'){
@@ -16108,26 +22119,49 @@ yy1227:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= 'E')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1170;
+=======
 			goto yy1195;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'f')	goto yy1203;
+=======
 			if(yych == 'f')	goto yy1228;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1203:
+	YYDEBUG(1203, *YYCURSOR);
+=======
 yy1228:
 	YYDEBUG(1228, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'T')	goto yy1171;
+=======
 	if(yych == 'T')	goto yy1196;
+>>>>>>> 1.55
 	if(yych != 't')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1204;
+yy1204:
+	YYDEBUG(1204, *YYCURSOR);
+=======
 	goto yy1229;
 yy1229:
 	YYDEBUG(1229, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '^'){
 		if(yych <= '/'){
@@ -16148,8 +22182,13 @@ yy1229:
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy1205:
+	YYDEBUG(1205, *YYCURSOR);
+=======
 yy1230:
 	YYDEBUG(1230, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'S'){
@@ -16160,7 +22199,11 @@ yy1230:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy341;
 			if(yych <= 'R')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1173;
+=======
 			goto yy1198;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16168,13 +22211,22 @@ yy1230:
 			if(yych == '_')	goto yy138;
 			goto yy341;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 's')	goto yy1206;
+=======
 			if(yych == 's')	goto yy1231;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy341;
 		}
 	}
+<<<<<<< parse_date.c
+yy1206:
+	YYDEBUG(1206, *YYCURSOR);
+=======
 yy1231:
 	YYDEBUG(1231, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'D'){
@@ -16184,32 +22236,60 @@ yy1231:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= 'C')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1174;
+=======
 			goto yy1199;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'd')	goto yy1207;
+=======
 			if(yych == 'd')	goto yy1232;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1207:
+	YYDEBUG(1207, *YYCURSOR);
+=======
 yy1232:
 	YYDEBUG(1232, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy1175;
+=======
 	if(yych == 'A')	goto yy1200;
+>>>>>>> 1.55
 	if(yych != 'a')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1208;
+yy1208:
+	YYDEBUG(1208, *YYCURSOR);
+=======
 	goto yy1233;
 yy1233:
 	YYDEBUG(1233, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych == 'Y')	goto yy347;
 	if(yych == 'y')	goto yy355;
 	goto yy144;
+<<<<<<< parse_date.c
+yy1209:
+	YYDEBUG(1209, *YYCURSOR);
+=======
 yy1234:
 	YYDEBUG(1234, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'A'){
@@ -16219,7 +22299,11 @@ yy1234:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1184;
+=======
 			goto yy1209;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '_'){
@@ -16228,13 +22312,22 @@ yy1234:
 			goto yy138;
 		} else {
 			if(yych <= '`')	goto yy3;
+<<<<<<< parse_date.c
+			if(yych <= 'a')	goto yy1216;
+=======
 			if(yych <= 'a')	goto yy1241;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1210:
+	YYDEBUG(1210, *YYCURSOR);
+=======
 yy1235:
 	YYDEBUG(1235, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'O'){
@@ -16245,7 +22338,11 @@ yy1235:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'N')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1178;
+=======
 			goto yy1203;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16253,13 +22350,22 @@ yy1235:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'o')	goto yy1211;
+=======
 			if(yych == 'o')	goto yy1236;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1211:
+	YYDEBUG(1211, *YYCURSOR);
+=======
 yy1236:
 	YYDEBUG(1236, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'R'){
@@ -16269,51 +22375,111 @@ yy1236:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= 'Q')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1179;
+=======
 			goto yy1204;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'r')	goto yy1212;
+=======
 			if(yych == 'r')	goto yy1237;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1212:
+	YYDEBUG(1212, *YYCURSOR);
+=======
 yy1237:
 	YYDEBUG(1237, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'R')	goto yy1180;
+=======
 	if(yych == 'R')	goto yy1205;
+>>>>>>> 1.55
 	if(yych != 'r')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1213;
+yy1213:
+	YYDEBUG(1213, *YYCURSOR);
+=======
 	goto yy1238;
 yy1238:
 	YYDEBUG(1238, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'O')	goto yy1181;
+=======
 	if(yych == 'O')	goto yy1206;
+>>>>>>> 1.55
 	if(yych != 'o')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1214;
+yy1214:
+	YYDEBUG(1214, *YYCURSOR);
+=======
 	goto yy1239;
 yy1239:
 	YYDEBUG(1239, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'W')	goto yy1182;
+=======
 	if(yych == 'W')	goto yy1207;
+>>>>>>> 1.55
 	if(yych != 'w')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1215;
+yy1215:
+	YYDEBUG(1215, *YYCURSOR);
+=======
 	goto yy1240;
 yy1240:
 	YYDEBUG(1240, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 22;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '^'){
 		if(yych == '/')	goto yy138;
+<<<<<<< parse_date.c
+		goto yy1183;
+=======
 		goto yy1208;
+>>>>>>> 1.55
 	} else {
 		if(yych <= '_')	goto yy138;
+<<<<<<< parse_date.c
+		if(yych <= '`')	goto yy1183;
+=======
 		if(yych <= '`')	goto yy1208;
+>>>>>>> 1.55
 		if(yych <= 'z')	goto yy143;
+<<<<<<< parse_date.c
+		goto yy1183;
+=======
 		goto yy1208;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1216:
+	YYDEBUG(1216, *YYCURSOR);
+=======
 yy1241:
 	YYDEBUG(1241, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Y'){
@@ -16323,33 +22489,63 @@ yy1241:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= 'X')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1185;
+=======
 			goto yy1210;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'y')	goto yy1217;
+=======
 			if(yych == 'y')	goto yy1242;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1217:
+	YYDEBUG(1217, *YYCURSOR);
+=======
 yy1242:
 	YYDEBUG(1242, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 23;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '^'){
 		if(yych == '/')	goto yy138;
+<<<<<<< parse_date.c
+		goto yy1186;
+=======
 		goto yy1211;
+>>>>>>> 1.55
 	} else {
 		if(yych <= '_')	goto yy138;
+<<<<<<< parse_date.c
+		if(yych <= '`')	goto yy1186;
+=======
 		if(yych <= '`')	goto yy1211;
+>>>>>>> 1.55
 		if(yych <= 'z')	goto yy143;
+<<<<<<< parse_date.c
+		goto yy1186;
+=======
 		goto yy1211;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1218:
+	YYDEBUG(1218, *YYCURSOR);
+=======
 yy1243:
 	YYDEBUG(1243, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'R'){
@@ -16360,7 +22556,11 @@ yy1243:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy341;
 			if(yych <= 'Q')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1190;
+=======
 			goto yy1215;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16368,13 +22568,22 @@ yy1243:
 			if(yych == '_')	goto yy138;
 			goto yy341;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'r')	goto yy1221;
+=======
 			if(yych == 'r')	goto yy1246;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy341;
 		}
 	}
+<<<<<<< parse_date.c
+yy1219:
+	YYDEBUG(1219, *YYCURSOR);
+=======
 yy1244:
 	YYDEBUG(1244, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'S'){
@@ -16385,7 +22594,11 @@ yy1244:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'Q')	goto yy135;
+<<<<<<< parse_date.c
+			if(yych <= 'R')	goto yy1189;
+=======
 			if(yych <= 'R')	goto yy1214;
+>>>>>>> 1.55
 			goto yy317;
 		}
 	} else {
@@ -16396,7 +22609,11 @@ yy1244:
 		} else {
 			if(yych <= 'r'){
 				if(yych <= 'q')	goto yy142;
+<<<<<<< parse_date.c
+				goto yy1220;
+=======
 				goto yy1245;
+>>>>>>> 1.55
 			} else {
 				if(yych <= 's')	goto yy320;
 				if(yych <= 'z')	goto yy142;
@@ -16404,8 +22621,13 @@ yy1244:
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1220:
+	YYDEBUG(1220, *YYCURSOR);
+=======
 yy1245:
 	YYDEBUG(1245, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'D'){
@@ -16427,8 +22649,13 @@ yy1245:
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1221:
+	YYDEBUG(1221, *YYCURSOR);
+=======
 yy1246:
 	YYDEBUG(1246, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'S'){
@@ -16438,38 +22665,76 @@ yy1246:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= 'R')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1191;
+=======
 			goto yy1216;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 's')	goto yy1222;
+=======
 			if(yych == 's')	goto yy1247;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1222:
+	YYDEBUG(1222, *YYCURSOR);
+=======
 yy1247:
 	YYDEBUG(1247, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'D')	goto yy1192;
+=======
 	if(yych == 'D')	goto yy1217;
+>>>>>>> 1.55
 	if(yych != 'd')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1223;
+yy1223:
+	YYDEBUG(1223, *YYCURSOR);
+=======
 	goto yy1248;
 yy1248:
 	YYDEBUG(1248, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'A')	goto yy1193;
+=======
 	if(yych == 'A')	goto yy1218;
+>>>>>>> 1.55
 	if(yych != 'a')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1224;
+yy1224:
+	YYDEBUG(1224, *YYCURSOR);
+=======
 	goto yy1249;
 yy1249:
 	YYDEBUG(1249, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych == 'Y')	goto yy347;
 	if(yych == 'y')	goto yy355;
 	goto yy144;
+<<<<<<< parse_date.c
+yy1225:
+	YYDEBUG(1225, *YYCURSOR);
+=======
 yy1250:
 	YYDEBUG(1250, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'T'){
@@ -16480,7 +22745,11 @@ yy1250:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'S')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1195;
+=======
 			goto yy1220;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16488,13 +22757,22 @@ yy1250:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 't')	goto yy1226;
+=======
 			if(yych == 't')	goto yy1251;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1226:
+	YYDEBUG(1226, *YYCURSOR);
+=======
 yy1251:
 	YYDEBUG(1251, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'H'){
@@ -16516,32 +22794,58 @@ yy1251:
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1227:
+	YYDEBUG(1227, *YYCURSOR);
+=======
 yy1252:
 	YYDEBUG(1252, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'Y'){
 		if(yych <= '@'){
 			if(yych == ')')	goto yy132;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'R')	goto yy1238;
+=======
 			if(yych == 'R')	goto yy1263;
+>>>>>>> 1.55
 			if(yych <= 'X')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1239;
+=======
 			goto yy1264;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
 			if(yych <= 'Z')	goto yy134;
 			if(yych <= '`')	goto yy3;
 			if(yych <= 'q')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1238;
+=======
 			goto yy1263;
+>>>>>>> 1.55
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'y')	goto yy1239;
+=======
 			if(yych == 'y')	goto yy1264;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1228:
+	YYDEBUG(1228, *YYCURSOR);
+=======
 yy1253:
 	YYDEBUG(1253, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'D'){
 		if(yych <= ')'){
@@ -16550,7 +22854,11 @@ yy1253:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'C')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1233;
+=======
 			goto yy1258;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'c'){
@@ -16558,13 +22866,22 @@ yy1253:
 			if(yych <= '`')	goto yy3;
 			goto yy134;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'd')	goto yy1233;
+=======
 			if(yych <= 'd')	goto yy1258;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1229:
+	YYDEBUG(1229, *YYCURSOR);
+=======
 yy1254:
 	YYDEBUG(1254, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
 		if(yych <= ')'){
@@ -16573,7 +22890,11 @@ yy1254:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1230;
+=======
 			goto yy1255;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'm'){
@@ -16581,13 +22902,22 @@ yy1254:
 			if(yych <= '`')	goto yy3;
 			goto yy134;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1230;
+=======
 			if(yych <= 'n')	goto yy1255;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1230:
+	YYDEBUG(1230, *YYCURSOR);
+=======
 yy1255:
 	YYDEBUG(1255, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'D'){
 		if(yych <= ')'){
@@ -16596,7 +22926,11 @@ yy1255:
 		} else {
 			if(yych <= '@')	goto yy341;
 			if(yych <= 'C')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1231;
+=======
 			goto yy1256;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'c'){
@@ -16604,31 +22938,58 @@ yy1255:
 			if(yych <= '`')	goto yy341;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'd')	goto yy1231;
+=======
 			if(yych <= 'd')	goto yy1256;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy341;
 		}
 	}
+<<<<<<< parse_date.c
+yy1231:
+	YYDEBUG(1231, *YYCURSOR);
+=======
 yy1256:
 	YYDEBUG(1256, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '@'){
 		if(yych == ')')	goto yy132;
 		goto yy3;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'A')	goto yy1232;
+=======
 		if(yych <= 'A')	goto yy1257;
+>>>>>>> 1.55
 		if(yych != 'a')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1232;
+=======
 		goto yy1257;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1232:
+	YYDEBUG(1232, *YYCURSOR);
+=======
 yy1257:
 	YYDEBUG(1257, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych == 'Y')	goto yy347;
 	if(yych == 'y')	goto yy347;
 	goto yy53;
+<<<<<<< parse_date.c
+yy1233:
+	YYDEBUG(1233, *YYCURSOR);
+=======
 yy1258:
 	YYDEBUG(1258, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
 		if(yych <= ')'){
@@ -16637,7 +22998,11 @@ yy1258:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1234;
+=======
 			goto yy1259;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'm'){
@@ -16645,43 +23010,95 @@ yy1258:
 			if(yych <= '`')	goto yy3;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1234;
+=======
 			if(yych <= 'n')	goto yy1259;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1234:
+	YYDEBUG(1234, *YYCURSOR);
+=======
 yy1259:
 	YYDEBUG(1259, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'H'){
 		if(yych == ')')	goto yy132;
 		goto yy3;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'I')	goto yy1235;
+=======
 		if(yych <= 'I')	goto yy1260;
+>>>>>>> 1.55
 		if(yych != 'i')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1235;
+=======
 		goto yy1260;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1235:
+	YYDEBUG(1235, *YYCURSOR);
+=======
 yy1260:
 	YYDEBUG(1260, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'G')	goto yy1236;
+=======
 	if(yych == 'G')	goto yy1261;
+>>>>>>> 1.55
 	if(yych != 'g')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1236;
+yy1236:
+	YYDEBUG(1236, *YYCURSOR);
+=======
 	goto yy1261;
 yy1261:
 	YYDEBUG(1261, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'H')	goto yy1237;
+=======
 	if(yych == 'H')	goto yy1262;
+>>>>>>> 1.55
 	if(yych != 'h')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1237;
+yy1237:
+	YYDEBUG(1237, *YYCURSOR);
+=======
 	goto yy1262;
 yy1262:
 	YYDEBUG(1262, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'T')	goto yy1185;
+	if(yych == 't')	goto yy1185;
+=======
 	if(yych == 'T')	goto yy1210;
 	if(yych == 't')	goto yy1210;
+>>>>>>> 1.55
 	goto yy53;
+<<<<<<< parse_date.c
+yy1238:
+	YYDEBUG(1238, *YYCURSOR);
+=======
 yy1263:
 	YYDEBUG(1263, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
@@ -16697,21 +23114,34 @@ yy1263:
 	} else {
 		if(yych <= 'Z'){
 			if(yych <= '@')	goto yy3;
+<<<<<<< parse_date.c
+			if(yych == 'C')	goto yy1240;
+=======
 			if(yych == 'C')	goto yy1265;
+>>>>>>> 1.55
 			goto yy135;
 		} else {
 			if(yych <= 'b'){
 				if(yych <= '`')	goto yy3;
 				goto yy135;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'c')	goto yy1240;
+=======
 				if(yych <= 'c')	goto yy1265;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy135;
 				goto yy3;
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1239:
+	YYDEBUG(1239, *YYCURSOR);
+=======
 yy1264:
 	YYDEBUG(1264, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '.'){
@@ -16735,8 +23165,13 @@ yy1264:
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1240:
+	YYDEBUG(1240, *YYCURSOR);
+=======
 yy1265:
 	YYDEBUG(1265, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'G'){
@@ -16747,8 +23182,13 @@ yy1265:
 		if(yych == 'h')	goto yy358;
 		goto yy3;
 	}
+<<<<<<< parse_date.c
+yy1241:
+	YYDEBUG(1241, *YYCURSOR);
+=======
 yy1266:
 	YYDEBUG(1266, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'Y'){
@@ -16761,9 +23201,17 @@ yy1266:
 				if(yych <= '@')	goto yy3;
 				goto yy134;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'R')	goto yy1238;
+=======
 				if(yych <= 'R')	goto yy1263;
+>>>>>>> 1.55
 				if(yych <= 'X')	goto yy134;
+<<<<<<< parse_date.c
+				goto yy1239;
+=======
 				goto yy1264;
+>>>>>>> 1.55
 			}
 		}
 	} else {
@@ -16778,17 +23226,30 @@ yy1266:
 			}
 		} else {
 			if(yych <= 'x'){
+<<<<<<< parse_date.c
+				if(yych <= 'r')	goto yy1252;
+=======
 				if(yych <= 'r')	goto yy1277;
+>>>>>>> 1.55
 				goto yy137;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'y')	goto yy1253;
+=======
 				if(yych <= 'y')	goto yy1278;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy137;
 				goto yy3;
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1242:
+	YYDEBUG(1242, *YYCURSOR);
+=======
 yy1267:
 	YYDEBUG(1267, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'D'){
@@ -16799,7 +23260,11 @@ yy1267:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'C')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1233;
+=======
 			goto yy1258;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16807,13 +23272,22 @@ yy1267:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'd')	goto yy1247;
+=======
 			if(yych == 'd')	goto yy1272;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy137;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1243:
+	YYDEBUG(1243, *YYCURSOR);
+=======
 yy1268:
 	YYDEBUG(1268, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'N'){
@@ -16824,7 +23298,11 @@ yy1268:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1230;
+=======
 			goto yy1255;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16832,13 +23310,22 @@ yy1268:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'n')	goto yy1244;
+=======
 			if(yych == 'n')	goto yy1269;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy137;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1244:
+	YYDEBUG(1244, *YYCURSOR);
+=======
 yy1269:
 	YYDEBUG(1269, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 5;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'D'){
@@ -16849,7 +23336,11 @@ yy1269:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy341;
 			if(yych <= 'C')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1231;
+=======
 			goto yy1256;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16857,13 +23348,22 @@ yy1269:
 			if(yych == '_')	goto yy138;
 			goto yy341;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'd')	goto yy1245;
+=======
 			if(yych == 'd')	goto yy1270;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy341;
 		}
 	}
+<<<<<<< parse_date.c
+yy1245:
+	YYDEBUG(1245, *YYCURSOR);
+=======
 yy1270:
 	YYDEBUG(1270, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'A'){
@@ -16873,26 +23373,44 @@ yy1270:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1232;
+=======
 			goto yy1257;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'a')	goto yy1246;
+=======
 			if(yych <= 'a')	goto yy1271;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1246:
+	YYDEBUG(1246, *YYCURSOR);
+=======
 yy1271:
 	YYDEBUG(1271, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych == 'Y')	goto yy347;
 	if(yych == 'y')	goto yy355;
 	goto yy144;
+<<<<<<< parse_date.c
+yy1247:
+	YYDEBUG(1247, *YYCURSOR);
+=======
 yy1272:
 	YYDEBUG(1272, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'N'){
@@ -16903,7 +23421,11 @@ yy1272:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1234;
+=======
 			goto yy1259;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -16911,13 +23433,22 @@ yy1272:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'n')	goto yy1248;
+=======
 			if(yych == 'n')	goto yy1273;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1248:
+	YYDEBUG(1248, *YYCURSOR);
+=======
 yy1273:
 	YYDEBUG(1273, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'I'){
@@ -16927,38 +23458,81 @@ yy1273:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= 'H')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1235;
+=======
 			goto yy1260;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'i')	goto yy1249;
+=======
 			if(yych == 'i')	goto yy1274;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1249:
+	YYDEBUG(1249, *YYCURSOR);
+=======
 yy1274:
 	YYDEBUG(1274, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'G')	goto yy1236;
+=======
 	if(yych == 'G')	goto yy1261;
+>>>>>>> 1.55
 	if(yych != 'g')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1250;
+yy1250:
+	YYDEBUG(1250, *YYCURSOR);
+=======
 	goto yy1275;
 yy1275:
 	YYDEBUG(1275, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'H')	goto yy1237;
+=======
 	if(yych == 'H')	goto yy1262;
+>>>>>>> 1.55
 	if(yych != 'h')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1251;
+yy1251:
+	YYDEBUG(1251, *YYCURSOR);
+=======
 	goto yy1276;
 yy1276:
 	YYDEBUG(1276, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'T')	goto yy1185;
+	if(yych == 't')	goto yy1217;
+=======
 	if(yych == 'T')	goto yy1210;
 	if(yych == 't')	goto yy1242;
+>>>>>>> 1.55
 	goto yy144;
+<<<<<<< parse_date.c
+yy1252:
+	YYDEBUG(1252, *YYCURSOR);
+=======
 yy1277:
 	YYDEBUG(1277, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '@'){
@@ -16980,7 +23554,11 @@ yy1277:
 		if(yych <= '_'){
 			if(yych <= 'C'){
 				if(yych <= 'B')	goto yy135;
+<<<<<<< parse_date.c
+				goto yy1240;
+=======
 				goto yy1265;
+>>>>>>> 1.55
 			} else {
 				if(yych <= 'Z')	goto yy135;
 				if(yych <= '^')	goto yy3;
@@ -16991,14 +23569,23 @@ yy1277:
 				if(yych <= '`')	goto yy3;
 				goto yy142;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'c')	goto yy1254;
+=======
 				if(yych <= 'c')	goto yy1279;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy142;
 				goto yy3;
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1253:
+	YYDEBUG(1253, *YYCURSOR);
+=======
 yy1278:
 	YYDEBUG(1278, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
@@ -17024,8 +23611,13 @@ yy1278:
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1254:
+	YYDEBUG(1254, *YYCURSOR);
+=======
 yy1279:
 	YYDEBUG(1279, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'H'){
@@ -17047,8 +23639,13 @@ yy1279:
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1255:
+	YYDEBUG(1255, *YYCURSOR);
+=======
 yy1280:
 	YYDEBUG(1280, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'W'){
 		if(yych <= 'N'){
@@ -17056,30 +23653,56 @@ yy1280:
 			if(yych <= '@')	goto yy3;
 			goto yy134;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'O')	goto yy1263;
+=======
 			if(yych <= 'O')	goto yy1288;
+>>>>>>> 1.55
 			if(yych <= 'U')	goto yy134;
+<<<<<<< parse_date.c
+			if(yych <= 'V')	goto yy1264;
+			goto yy1261;
+=======
 			if(yych <= 'V')	goto yy1289;
 			goto yy1286;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'o'){
 			if(yych <= 'Z')	goto yy134;
 			if(yych <= '`')	goto yy3;
 			if(yych <= 'n')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1263;
+=======
 			goto yy1288;
+>>>>>>> 1.55
 		} else {
 			if(yych <= 'v'){
 				if(yych <= 'u')	goto yy134;
+<<<<<<< parse_date.c
+				goto yy1264;
+=======
 				goto yy1289;
+>>>>>>> 1.55
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'w')	goto yy1261;
+=======
 				if(yych <= 'w')	goto yy1286;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy134;
 				goto yy3;
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1256:
+	YYDEBUG(1256, *YYCURSOR);
+=======
 yy1281:
 	YYDEBUG(1281, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'X'){
 		if(yych <= ')'){
@@ -17088,7 +23711,11 @@ yy1281:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'W')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1260;
+=======
 			goto yy1285;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'w'){
@@ -17096,13 +23723,22 @@ yy1281:
 			if(yych <= '`')	goto yy3;
 			goto yy134;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'x')	goto yy1260;
+=======
 			if(yych <= 'x')	goto yy1285;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1257:
+	YYDEBUG(1257, *YYCURSOR);
+=======
 yy1282:
 	YYDEBUG(1282, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
 		if(yych <= ')'){
@@ -17111,7 +23747,11 @@ yy1282:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1258;
+=======
 			goto yy1283;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'm'){
@@ -17119,13 +23759,22 @@ yy1282:
 			if(yych <= '`')	goto yy3;
 			goto yy134;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1258;
+=======
 			if(yych <= 'n')	goto yy1283;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1258:
+	YYDEBUG(1258, *YYCURSOR);
+=======
 yy1283:
 	YYDEBUG(1283, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'T'){
 		if(yych <= ')'){
@@ -17134,7 +23783,11 @@ yy1283:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'S')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1259;
+=======
 			goto yy1284;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 's'){
@@ -17142,13 +23795,22 @@ yy1283:
 			if(yych <= '`')	goto yy3;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 't')	goto yy1259;
+=======
 			if(yych <= 't')	goto yy1284;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1259:
+	YYDEBUG(1259, *YYCURSOR);
+=======
 yy1284:
 	YYDEBUG(1284, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'G'){
@@ -17159,8 +23821,13 @@ yy1284:
 		if(yych == 'h')	goto yy159;
 		goto yy3;
 	}
+<<<<<<< parse_date.c
+yy1260:
+	YYDEBUG(1260, *YYCURSOR);
+=======
 yy1285:
 	YYDEBUG(1285, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'T'){
 		if(yych <= ')'){
@@ -17182,20 +23849,42 @@ yy1285:
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1261:
+	YYDEBUG(1261, *YYCURSOR);
+=======
 yy1286:
 	YYDEBUG(1286, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
 	if((yych = *YYCURSOR) <= '@'){
 		if(yych == ')')	goto yy132;
+<<<<<<< parse_date.c
+		goto yy1262;
+=======
 		goto yy1287;
+>>>>>>> 1.55
 	} else {
 		if(yych <= 'Z')	goto yy135;
+<<<<<<< parse_date.c
+		if(yych <= '`')	goto yy1262;
+=======
 		if(yych <= '`')	goto yy1287;
+>>>>>>> 1.55
 		if(yych <= 'z')	goto yy135;
+<<<<<<< parse_date.c
+		goto yy1262;
+=======
 		goto yy1287;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1262:
+	YYDEBUG(1262, *YYCURSOR);
+=======
 yy1287:
 	YYDEBUG(1287, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 862 "ext/date/lib/parse_date.re"
 {
@@ -17205,9 +23894,15 @@ yy1287:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
+<<<<<<< parse_date.c
+#line 15344 "ext/date/lib/parse_date.c"
+yy1263:
+	YYDEBUG(1263, *YYCURSOR);
+=======
 #line 14598 "ext/date/lib/parse_date.c"
 yy1288:
 	YYDEBUG(1288, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'N'){
 		if(yych <= ')'){
@@ -17216,7 +23911,11 @@ yy1288:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1269;
+=======
 			goto yy1294;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'm'){
@@ -17224,13 +23923,22 @@ yy1288:
 			if(yych <= '`')	goto yy3;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 'n')	goto yy1269;
+=======
 			if(yych <= 'n')	goto yy1294;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1264:
+	YYDEBUG(1264, *YYCURSOR);
+=======
 yy1289:
 	YYDEBUG(1289, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '9'){
@@ -17247,55 +23955,112 @@ yy1289:
 		if(yych <= 'Z'){
 			if(yych <= '@')	goto yy3;
 			if(yych != 'E')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1265;
+=======
 			goto yy1290;
+>>>>>>> 1.55
 		} else {
 			if(yych <= 'd'){
 				if(yych <= '`')	goto yy3;
 				goto yy135;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'e')	goto yy1265;
+=======
 				if(yych <= 'e')	goto yy1290;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy135;
 				goto yy3;
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1265:
+	YYDEBUG(1265, *YYCURSOR);
+=======
 yy1290:
 	YYDEBUG(1290, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'L'){
 		if(yych == ')')	goto yy132;
 		goto yy3;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'M')	goto yy1266;
+=======
 		if(yych <= 'M')	goto yy1291;
+>>>>>>> 1.55
 		if(yych != 'm')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1266;
+=======
 		goto yy1291;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1266:
+	YYDEBUG(1266, *YYCURSOR);
+=======
 yy1291:
 	YYDEBUG(1291, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy1267;
+=======
 	if(yych == 'B')	goto yy1292;
+>>>>>>> 1.55
 	if(yych != 'b')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1267;
+yy1267:
+	YYDEBUG(1267, *YYCURSOR);
+=======
 	goto yy1292;
 yy1292:
 	YYDEBUG(1292, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy1268;
+=======
 	if(yych == 'E')	goto yy1293;
+>>>>>>> 1.55
 	if(yych != 'e')	goto yy53;
+<<<<<<< parse_date.c
+	goto yy1268;
+yy1268:
+	YYDEBUG(1268, *YYCURSOR);
+=======
 	goto yy1293;
 yy1293:
 	YYDEBUG(1293, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych == 'R')	goto yy358;
 	if(yych == 'r')	goto yy358;
 	goto yy53;
+<<<<<<< parse_date.c
+yy1269:
+	YYDEBUG(1269, *YYCURSOR);
+=======
 yy1294:
 	YYDEBUG(1294, *YYCURSOR);
+>>>>>>> 1.55
 	++YYCURSOR;
 	if((yych = *YYCURSOR) == ')')	goto yy132;
+<<<<<<< parse_date.c
+	goto yy1270;
+yy1270:
+	YYDEBUG(1270, *YYCURSOR);
+=======
 	goto yy1295;
 yy1295:
 	YYDEBUG(1295, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 871 "ext/date/lib/parse_date.re"
 {
@@ -17308,9 +24073,15 @@ yy1295:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
+<<<<<<< parse_date.c
+#line 15431 "ext/date/lib/parse_date.c"
+yy1271:
+	YYDEBUG(1271, *YYCURSOR);
+=======
 #line 14685 "ext/date/lib/parse_date.c"
 yy1296:
 	YYDEBUG(1296, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'W'){
@@ -17325,11 +24096,20 @@ yy1296:
 		} else {
 			if(yych <= 'O'){
 				if(yych <= 'N')	goto yy134;
+<<<<<<< parse_date.c
+				goto yy1263;
+=======
 				goto yy1288;
+>>>>>>> 1.55
 			} else {
 				if(yych <= 'U')	goto yy134;
+<<<<<<< parse_date.c
+				if(yych <= 'V')	goto yy1264;
+				goto yy1261;
+=======
 				if(yych <= 'V')	goto yy1289;
 				goto yy1286;
+>>>>>>> 1.55
 			}
 		}
 	} else {
@@ -17344,18 +24124,35 @@ yy1296:
 			}
 		} else {
 			if(yych <= 'v'){
+<<<<<<< parse_date.c
+				if(yych <= 'o')	goto yy1278;
+=======
 				if(yych <= 'o')	goto yy1303;
+>>>>>>> 1.55
 				if(yych <= 'u')	goto yy137;
+<<<<<<< parse_date.c
+				goto yy1279;
+=======
 				goto yy1304;
+>>>>>>> 1.55
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'w')	goto yy1277;
+=======
 				if(yych <= 'w')	goto yy1302;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy137;
 				goto yy3;
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1272:
+	YYDEBUG(1272, *YYCURSOR);
+=======
 yy1297:
 	YYDEBUG(1297, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'X'){
@@ -17366,7 +24163,11 @@ yy1297:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'W')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1260;
+=======
 			goto yy1285;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -17374,13 +24175,22 @@ yy1297:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'x')	goto yy1276;
+=======
 			if(yych == 'x')	goto yy1301;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy137;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1273:
+	YYDEBUG(1273, *YYCURSOR);
+=======
 yy1298:
 	YYDEBUG(1298, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'N'){
@@ -17391,7 +24201,11 @@ yy1298:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1258;
+=======
 			goto yy1283;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -17399,13 +24213,22 @@ yy1298:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'n')	goto yy1274;
+=======
 			if(yych == 'n')	goto yy1299;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy137;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1274:
+	YYDEBUG(1274, *YYCURSOR);
+=======
 yy1299:
 	YYDEBUG(1299, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'T'){
@@ -17416,7 +24239,11 @@ yy1299:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'S')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1259;
+=======
 			goto yy1284;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -17424,13 +24251,22 @@ yy1299:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 't')	goto yy1275;
+=======
 			if(yych == 't')	goto yy1300;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1275:
+	YYDEBUG(1275, *YYCURSOR);
+=======
 yy1300:
 	YYDEBUG(1300, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'H'){
@@ -17452,8 +24288,13 @@ yy1300:
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1276:
+	YYDEBUG(1276, *YYCURSOR);
+=======
 yy1301:
 	YYDEBUG(1301, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'T'){
@@ -17477,31 +24318,61 @@ yy1301:
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1277:
+	YYDEBUG(1277, *YYCURSOR);
+=======
 yy1302:
 	YYDEBUG(1302, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 24;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '@'){
 		if(yych <= ')'){
+<<<<<<< parse_date.c
+			if(yych <= '(')	goto yy1262;
+=======
 			if(yych <= '(')	goto yy1287;
+>>>>>>> 1.55
 			goto yy132;
 		} else {
 			if(yych == '/')	goto yy138;
+<<<<<<< parse_date.c
+			goto yy1262;
+=======
 			goto yy1287;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '_'){
 			if(yych <= 'Z')	goto yy135;
+<<<<<<< parse_date.c
+			if(yych <= '^')	goto yy1262;
+=======
 			if(yych <= '^')	goto yy1287;
+>>>>>>> 1.55
 			goto yy138;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '`')	goto yy1262;
+=======
 			if(yych <= '`')	goto yy1287;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
+<<<<<<< parse_date.c
+			goto yy1262;
+=======
 			goto yy1287;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1278:
+	YYDEBUG(1278, *YYCURSOR);
+=======
 yy1303:
 	YYDEBUG(1303, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'N'){
@@ -17512,7 +24383,11 @@ yy1303:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'M')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1269;
+=======
 			goto yy1294;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -17520,13 +24395,22 @@ yy1303:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'n')	goto yy1284;
+=======
 			if(yych == 'n')	goto yy1309;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1279:
+	YYDEBUG(1279, *YYCURSOR);
+=======
 yy1304:
 	YYDEBUG(1304, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '@'){
@@ -17548,7 +24432,11 @@ yy1304:
 		if(yych <= '_'){
 			if(yych <= 'E'){
 				if(yych <= 'D')	goto yy135;
+<<<<<<< parse_date.c
+				goto yy1265;
+=======
 				goto yy1290;
+>>>>>>> 1.55
 			} else {
 				if(yych <= 'Z')	goto yy135;
 				if(yych <= '^')	goto yy3;
@@ -17559,14 +24447,23 @@ yy1304:
 				if(yych <= '`')	goto yy3;
 				goto yy142;
 			} else {
+<<<<<<< parse_date.c
+				if(yych <= 'e')	goto yy1280;
+=======
 				if(yych <= 'e')	goto yy1305;
+>>>>>>> 1.55
 				if(yych <= 'z')	goto yy142;
 				goto yy3;
 			}
 		}
 	}
+<<<<<<< parse_date.c
+yy1280:
+	YYDEBUG(1280, *YYCURSOR);
+=======
 yy1305:
 	YYDEBUG(1305, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'M'){
@@ -17576,32 +24473,65 @@ yy1305:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= 'L')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1266;
+=======
 			goto yy1291;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'm')	goto yy1281;
+=======
 			if(yych == 'm')	goto yy1306;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1281:
+	YYDEBUG(1281, *YYCURSOR);
+=======
 yy1306:
 	YYDEBUG(1306, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'B')	goto yy1267;
+=======
 	if(yych == 'B')	goto yy1292;
+>>>>>>> 1.55
 	if(yych != 'b')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1282;
+yy1282:
+	YYDEBUG(1282, *YYCURSOR);
+=======
 	goto yy1307;
 yy1307:
 	YYDEBUG(1307, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'E')	goto yy1268;
+=======
 	if(yych == 'E')	goto yy1293;
+>>>>>>> 1.55
 	if(yych != 'e')	goto yy144;
+<<<<<<< parse_date.c
+	goto yy1283;
+yy1283:
+	YYDEBUG(1283, *YYCURSOR);
+=======
 	goto yy1308;
 yy1308:
 	YYDEBUG(1308, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= '^'){
 		if(yych <= '/'){
@@ -17622,26 +24552,52 @@ yy1308:
 			goto yy53;
 		}
 	}
+<<<<<<< parse_date.c
+yy1284:
+	YYDEBUG(1284, *YYCURSOR);
+=======
 yy1309:
 	YYDEBUG(1309, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 25;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '/'){
 		if(yych == ')')	goto yy132;
+<<<<<<< parse_date.c
+		if(yych <= '.')	goto yy1270;
+=======
 		if(yych <= '.')	goto yy1295;
+>>>>>>> 1.55
 		goto yy138;
 	} else {
 		if(yych <= '_'){
+<<<<<<< parse_date.c
+			if(yych <= '^')	goto yy1270;
+=======
 			if(yych <= '^')	goto yy1295;
+>>>>>>> 1.55
 			goto yy138;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= '`')	goto yy1270;
+=======
 			if(yych <= '`')	goto yy1295;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
+<<<<<<< parse_date.c
+			goto yy1270;
+=======
 			goto yy1295;
+>>>>>>> 1.55
 		}
 	}
+<<<<<<< parse_date.c
+yy1285:
+	YYDEBUG(1285, *YYCURSOR);
+=======
 yy1310:
 	YYDEBUG(1310, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'S'){
 		if(yych <= ')'){
@@ -17650,7 +24606,11 @@ yy1310:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'R')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1286;
+=======
 			goto yy1311;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 'r'){
@@ -17658,13 +24618,22 @@ yy1310:
 			if(yych <= '`')	goto yy3;
 			goto yy134;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 's')	goto yy1286;
+=======
 			if(yych <= 's')	goto yy1311;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy134;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1286:
+	YYDEBUG(1286, *YYCURSOR);
+=======
 yy1311:
 	YYDEBUG(1311, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
 	if(yych <= 'T'){
 		if(yych <= ')'){
@@ -17673,7 +24642,11 @@ yy1311:
 		} else {
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'S')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1287;
+=======
 			goto yy1312;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= 's'){
@@ -17681,23 +24654,44 @@ yy1311:
 			if(yych <= '`')	goto yy3;
 			goto yy135;
 		} else {
+<<<<<<< parse_date.c
+			if(yych <= 't')	goto yy1287;
+=======
 			if(yych <= 't')	goto yy1312;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy135;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1287:
+	YYDEBUG(1287, *YYCURSOR);
+=======
 yy1312:
 	YYDEBUG(1312, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'D'){
 		if(yych == ')')	goto yy132;
 		goto yy3;
 	} else {
+<<<<<<< parse_date.c
+		if(yych <= 'E')	goto yy1288;
+=======
 		if(yych <= 'E')	goto yy1313;
+>>>>>>> 1.55
 		if(yych != 'e')	goto yy3;
+<<<<<<< parse_date.c
+		goto yy1288;
+=======
 		goto yy1313;
+>>>>>>> 1.55
 	}
+<<<<<<< parse_date.c
+yy1288:
+	YYDEBUG(1288, *YYCURSOR);
+=======
 yy1313:
 	YYDEBUG(1313, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -17712,13 +24706,45 @@ yy1314:
 	goto yy1315;
 yy1315:
 	YYDEBUG(1315, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'R')	goto yy1289;
+	if(yych != 'r')	goto yy53;
+	goto yy1289;
+yy1289:
+	YYDEBUG(1289, *YYCURSOR);
+=======
 	if(yych == 'A')	goto yy1316;
 	if(yych != 'a')	goto yy53;
 	goto yy1316;
 yy1316:
 	YYDEBUG(1316, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'D')	goto yy1290;
+	if(yych != 'd')	goto yy53;
+	goto yy1290;
+yy1290:
+	YYDEBUG(1290, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'A')	goto yy1291;
+	if(yych != 'a')	goto yy53;
+	goto yy1291;
+yy1291:
+	YYDEBUG(1291, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych == 'Y')	goto yy1292;
+	if(yych != 'y')	goto yy53;
+	goto yy1292;
+yy1292:
+	YYDEBUG(1292, *YYCURSOR);
+	++YYCURSOR;
+	goto yy1293;
+yy1293:
+	YYDEBUG(1293, *YYCURSOR);
+=======
 	if(yych == 'Y')	goto yy1317;
 	if(yych != 'y')	goto yy53;
 	goto yy1317;
@@ -17728,6 +24754,7 @@ yy1317:
 	goto yy1318;
 yy1318:
 	YYDEBUG(1318, *YYCURSOR);
+>>>>>>> 1.55
 
 #line 850 "ext/date/lib/parse_date.re"
 {
@@ -17740,9 +24767,15 @@ yy1318:
 		TIMELIB_DEINIT;
 		return TIMELIB_RELATIVE;
 	}
+<<<<<<< parse_date.c
+#line 15817 "ext/date/lib/parse_date.c"
+yy1294:
+	YYDEBUG(1294, *YYCURSOR);
+=======
 #line 15071 "ext/date/lib/parse_date.c"
 yy1319:
 	YYDEBUG(1319, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'S'){
@@ -17753,7 +24786,11 @@ yy1319:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'R')	goto yy134;
+<<<<<<< parse_date.c
+			goto yy1286;
+=======
 			goto yy1311;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -17761,13 +24798,22 @@ yy1319:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 's')	goto yy1295;
+=======
 			if(yych == 's')	goto yy1320;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy137;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1295:
+	YYDEBUG(1295, *YYCURSOR);
+=======
 yy1320:
 	YYDEBUG(1320, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'T'){
@@ -17778,7 +24824,11 @@ yy1320:
 			if(yych <= '/')	goto yy138;
 			if(yych <= '@')	goto yy3;
 			if(yych <= 'S')	goto yy135;
+<<<<<<< parse_date.c
+			goto yy1287;
+=======
 			goto yy1312;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
@@ -17786,13 +24836,22 @@ yy1320:
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 't')	goto yy1296;
+=======
 			if(yych == 't')	goto yy1321;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy142;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1296:
+	YYDEBUG(1296, *YYCURSOR);
+=======
 yy1321:
 	YYDEBUG(1321, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= 'E'){
@@ -17802,18 +24861,30 @@ yy1321:
 		} else {
 			if(yych <= '/')	goto yy138;
 			if(yych <= 'D')	goto yy3;
+<<<<<<< parse_date.c
+			goto yy1288;
+=======
 			goto yy1313;
+>>>>>>> 1.55
 		}
 	} else {
 		if(yych <= '`'){
 			if(yych == '_')	goto yy138;
 			goto yy3;
 		} else {
+<<<<<<< parse_date.c
+			if(yych == 'e')	goto yy1297;
+=======
 			if(yych == 'e')	goto yy1322;
+>>>>>>> 1.55
 			if(yych <= 'z')	goto yy143;
 			goto yy3;
 		}
 	}
+<<<<<<< parse_date.c
+yy1297:
+	YYDEBUG(1297, *YYCURSOR);
+=======
 yy1322:
 	YYDEBUG(1322, *YYCURSOR);
 	yych = *++YYCURSOR;
@@ -17828,28 +24899,69 @@ yy1323:
 	goto yy1324;
 yy1324:
 	YYDEBUG(1324, *YYCURSOR);
+>>>>>>> 1.55
 	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'R')	goto yy1289;
+	if(yych != 'r')	goto yy144;
+	goto yy1298;
+yy1298:
+	YYDEBUG(1298, *YYCURSOR);
+=======
 	if(yych == 'A')	goto yy1316;
 	if(yych != 'a')	goto yy144;
 	goto yy1325;
 yy1325:
 	YYDEBUG(1325, *YYCURSOR);
+>>>>>>> 1.55
+	yych = *++YYCURSOR;
+<<<<<<< parse_date.c
+	if(yych == 'D')	goto yy1290;
+	if(yych != 'd')	goto yy144;
+	goto yy1299;
+yy1299:
+	YYDEBUG(1299, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if(yych == 'A')	goto yy1291;
+	if(yych != 'a')	goto yy144;
+	goto yy1300;
+yy1300:
+	YYDEBUG(1300, *YYCURSOR);
 	yych = *++YYCURSOR;
+	if(yych == 'Y')	goto yy1292;
+	if(yych != 'y')	goto yy144;
+	goto yy1301;
+yy1301:
+	YYDEBUG(1301, *YYCURSOR);
+=======
 	if(yych == 'Y')	goto yy1317;
 	if(yych != 'y')	goto yy144;
 	goto yy1326;
 yy1326:
 	YYDEBUG(1326, *YYCURSOR);
+>>>>>>> 1.55
 	yyaccept = 26;
 	yych = *(YYMARKER = ++YYCURSOR);
 	if(yych <= '^'){
 		if(yych == '/')	goto yy138;
+<<<<<<< parse_date.c
+		goto yy1293;
+=======
 		goto yy1318;
+>>>>>>> 1.55
 	} else {
 		if(yych <= '_')	goto yy138;
+<<<<<<< parse_date.c
+		if(yych <= '`')	goto yy1293;
+=======
 		if(yych <= '`')	goto yy1318;
+>>>>>>> 1.55
 		if(yych <= 'z')	goto yy143;
+<<<<<<< parse_date.c
+		goto yy1293;
+=======
 		goto yy1318;
+>>>>>>> 1.55
 	}
 }
 }
diff --git a/ext/date/lib/parse_date.re b/ext/date/lib/parse_date.re
index 7bca29b000..5e865b0bc1 100644
--- a/ext/date/lib/parse_date.re
+++ b/ext/date/lib/parse_date.re
@@ -535,7 +535,7 @@ static long timelib_get_month(char **ptr)
 
 static void timelib_eat_spaces(char **ptr)
 {
-	while (**ptr == ' ') {
+	while (**ptr == ' ' || **ptr == '\t') {
 		++*ptr;
 	}
 }
@@ -736,7 +736,7 @@ std:
 /*!re2c
 any = [\000-\377];
 
-space = [ ]+;
+space = [ \t]+;
 frac = "."[0-9]+;
 
 ago = 'ago';
diff --git a/ext/date/tests/bug36510.phpt b/ext/date/tests/bug36510.phpt
new file mode 100644
index 0000000000..ea8bb028b2
--- /dev/null
+++ b/ext/date/tests/bug36510.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #36510 (strtotime() fails to parse date strings with tabs)
+--FILE--
+<?php
+date_default_timezone_set("UTC");
+
+$t = 1140973388;
+
+var_dump(strtotime("-2 hours", $t));
+var_dump(strtotime("-2\thours", $t));
+?>
+--EXPECT--
+int(1140966188)
+int(1140966188)