Merge "fixed incorrect LJ energy with GPU and PME load balancing" into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Tue, 23 Oct 2012 17:43:46 +0000 (19:43 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 23 Oct 2012 17:43:46 +0000 (19:43 +0200)

Trivial merge