Merge branch release-5-1
authorTeemu Murtola <teemu.murtola@gmail.com>
Thu, 5 May 2016 14:47:00 +0000 (17:47 +0300)
committerTeemu Murtola <teemu.murtola@gmail.com>
Thu, 5 May 2016 14:47:57 +0000 (17:47 +0300)
commit4f964e354b1df3bdfc5485317d0462b736f4cdf4
treed3ce42f08b12f9193ec1bfaaf3e8ad71d1ce4d38
parent770f143a3960cdd169e4dfb975378e1c77e909d5
parent7f6a6de5277440e7163f54f5ed66be6ce2c29b82
Merge branch release-5-1

No conflicts.

Change-Id: I582e9c267588d446f55788828866cc50781d74dd
docs/CMakeLists.txt
src/gromacs/gmxana/gmx_order.cpp