From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Wed, 3 Feb 2016 12:06:25 +0000 (+0100)
Subject: Merge release-5-0 into release-5-1
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=e91f58c98d9ceea6cee3f1834869edc07ab6c6b8;p=alexxy%2Fgromacs.git

Merge release-5-0 into release-5-1

Change-Id: I12e0bd25b9b114d0977401e8032078d7cfdd78cf
---

e91f58c98d9ceea6cee3f1834869edc07ab6c6b8
diff --cc src/gromacs/mdlib/stat.cpp
index 97cd398615,31bfe06b43..8e3e368159
--- a/src/gromacs/mdlib/stat.cpp
+++ b/src/gromacs/mdlib/stat.cpp
@@@ -3,7 -3,7 +3,7 @@@
   *
   * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
   * Copyright (c) 2001-2004, The GROMACS development team.
-  * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by
 - * Copyright (c) 2013,2014,2016, by the GROMACS development team, led by
++ * Copyright (c) 2013,2014,2015,2016, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.