Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 22 Jun 2016 08:22:48 +0000 (10:22 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 22 Jun 2016 08:22:48 +0000 (10:22 +0200)
commita05a7eba835ce168a60969b9c34affad46d25b9c
treecf1e585c6e9b747f5195d1a98afa08292cc4a712
parenta979704026ba384654288890bb4185c31b2eb811
parentfbc99c75abe169b792f53ddceecfe1e9226d199f
Merge branch release-5-1 into release-2016

Change-Id: I175bb4c5d313a33c0c95446f85b1af2128ce301c
src/gromacs/domdec/domdec_topology.cpp
src/gromacs/gmxpreprocess/specbond.cpp