Merge branch release-5-0 into release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Sat, 8 Aug 2015 13:56:03 +0000 (15:56 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Sat, 8 Aug 2015 13:57:19 +0000 (15:57 +0200)
commit2081b311bc760c83b16c3956def91c8b8a641f19
tree819f18e6b9e2462ac7cd2cdefbece706c8adba78
parentf57e748db0899a87278996be59ec2b7127790984
parentcf61f98e02e0c32ee18f4dcd10b51fdd97996198
Merge branch release-5-0 into release-5-1

No conflicts

Change-Id: I551220310b529542d4cc3635815101cf53b325ec
docs/manual/topology.tex
src/gromacs/gmxlib/copyrite.cpp