Merge r1741310, r1741461 from trunk:

[apache] / server / util_expr_parse.c

diff --git a/server/util_expr_parse.c b/server/util_expr_parse.c
index 68684eaf6767f0ba02fc63edc62acef9199cc66b..bcf0173b7321eff63fd510597a54722aadae4e01 100644 (file)
--- a/server/util_expr_parse.c
+++ b/server/util_expr_parse.c
@@ -2,7 +2,7 @@
 
 /* Bison implementation for Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by