Merge "Documented what GMX_CPU_ACCELERATION really means" into release-4-6
authorChristoph Junghans <junghans@votca.org>
Tue, 5 Feb 2013 23:52:49 +0000 (00:52 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 5 Feb 2013 23:52:49 +0000 (00:52 +0100)

Trivial merge