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)
No conflicts

Change-Id: I551220310b529542d4cc3635815101cf53b325ec

1  2 
docs/manual/topology.tex
src/gromacs/gmxlib/copyrite.cpp

Simple merge
Simple merge