Merge branch release-5-1 into release-2016
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 8 Jul 2016 13:41:00 +0000 (15:41 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 8 Jul 2016 13:42:01 +0000 (15:42 +0200)
commit612274586adf48f4131541d11abf9e92837ac77b
treec328d8773638bee00fac8258fe0d0f195e30e508
parentdeef4d6e02a67b3224f9c856301423071335033c
parent2a1052e2c66dcd3540fb56b573fc6eb0f7e01042
Merge branch release-5-1 into release-2016

Change-Id: I976ad584d1c8757c6464aae482cb5a4c245beacb
docs/user-guide/environment-variables.rst
src/gromacs/gmxana/gmx_dos.cpp