Merge release-5-0 into release-5-1
commit90e5c7b64e42dba60be8119a0b1d2e5356673854
authorRoland Schulz <roland@utk.edu>
Wed, 8 Jul 2015 07:35:13 +0000 (8 03:35 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 8 Jul 2015 17:14:49 +0000 (8 13:14 -0400)
treea5404950f1a2d9f34fb1479940e1304da826a104
parente6a9deb15d1fe80c299b2d6ca285415fd1ccf1b3
parent29ac4fea30657750f0b89b919698b1ca48e49b65
Merge release-5-0 into release-5-1

Conflicts:
src/gromacs/gmxana/gmx_dos.c

Change-Id: I06208bcafb880b9bac3f45050d709fae5eab9a9d
src/gromacs/gmxana/gmx_dos.c
src/gromacs/trajectoryanalysis/modules/distance.cpp