From f5e5c5811c1cb12209e49a8574b627f6d54ed5d1 Mon Sep 17 00:00:00 2001
From: Bastien Guerry <bzg@altern.org>
Date: Wed, 4 Jan 2012 16:12:43 +0100
Subject: [PATCH] More fixes to the copyright year...

Conflicts:

	lisp/ob-awk.el
	lisp/ob-fortran.el
	lisp/ob-java.el
	lisp/org-eshell.el
---
 lisp/ob-awk.el     | 2 +-
 lisp/ob-fortran.el | 2 +-
 lisp/ob-java.el    | 2 +-
 lisp/org-eshell.el | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/ob-awk.el b/lisp/ob-awk.el
index 1ba0a3569..ded8ee4f6 100644
--- a/lisp/ob-awk.el
+++ b/lisp/ob-awk.el
@@ -1,6 +1,6 @@
 ;;; ob-awk.el --- org-babel functions for awk evaluation
 
-;; Copyright (C) 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2011-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/lisp/ob-fortran.el b/lisp/ob-fortran.el
index 1b97f8724..f99c8d276 100644
--- a/lisp/ob-fortran.el
+++ b/lisp/ob-fortran.el
@@ -1,6 +1,6 @@
 ;;; ob-fortran.el --- org-babel functions for fortran
 
-;; Copyright (C) 2011 Sergey Litvinov, Eric Schulte
+;; Copyright (C) 2011-2012 Sergey Litvinov, Eric Schulte
 
 ;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte
 ;; Keywords: literate programming, reproducible research, fortran
diff --git a/lisp/ob-java.el b/lisp/ob-java.el
index bd02d30f0..75afda124 100644
--- a/lisp/ob-java.el
+++ b/lisp/ob-java.el
@@ -1,6 +1,6 @@
 ;;; ob-java.el --- org-babel functions for java evaluation
 
-;; Copyright (C) 2011  Free Software Foundation, Inc.
+;; Copyright (C) 2011-2012  Free Software Foundation, Inc.
 
 ;; Author: Eric Schulte
 ;; Keywords: literate programming, reproducible research
diff --git a/lisp/org-eshell.el b/lisp/org-eshell.el
index c8754d76b..9fae6fdd6 100644
--- a/lisp/org-eshell.el
+++ b/lisp/org-eshell.el
@@ -1,6 +1,7 @@
 ;;; org-eshell.el - Support for links to working directories in eshell
-;; Copyright (C) 2011 Free Software Foundation, Inc.
-;;
+
+;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
+
 ;; Author: Konrad Hinsen <konrad.hinsen AT fastmail.net>
 ;; Version: 7.8.03
 ;;
-- 
2.11.4.GIT