Merge branch 'release-2018' into master
authorAleksei Iupinov <a.yupinov@gmail.com>
Wed, 17 Jan 2018 12:29:47 +0000 (13:29 +0100)
committerAleksei Iupinov <a.yupinov@gmail.com>
Wed, 17 Jan 2018 12:29:47 +0000 (13:29 +0100)
Change-Id: I101621e6fca6729cc42cd7eb6678c1471ccf6ef2

1  2 
src/programs/mdrun/runner.cpp

Simple merge