Merge branch release-5-1
commit5b91e1c89e047fc509e8e8920275f738c754b98b
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 27 Apr 2016 15:51:24 +0000 (27 17:51 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 27 Apr 2016 15:51:45 +0000 (27 17:51 +0200)
treef56e851d2db0de772c3528b0047e5627ec03232c
parent8a8904ad6964f7c5d003ab4510f33b635568375f
parenta96cd4042dd15a0ff7f3089ff1cb10d3c3e326cf
Merge branch release-5-1

Change-Id: I6fdd1b6186911b41d6089c70ee26eff1909fd6e5
docs/user-guide/mdp-options.rst
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdlib/qm_gaussian.cpp
src/gromacs/mdlib/qmmm.cpp