Merge from trunk.

[gnu-emacs] / src / keymap.c

diff --git a/src/keymap.c b/src/keymap.c
index 2a0f162a0e0a388357c2e616d3a0f4fb2ab7c0af..cc4419a4d2f0425ded270887c64a8aeb0f012e14 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1,5 +1,5 @@
 /* Manipulation of keymaps
-   Copyright (C) 1985-1988, 1993-1995, 1998-2011 Free Software Foundation, Inc.
+   Copyright (C) 1985-1988, 1993-1995, 1998-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.