Merge changes If0c2f9d9,Ic2a8ad82 into release-4-5-patches
authorSzilárd Páll <pszilard@cbr.su.se>
Sat, 11 Feb 2012 16:45:25 +0000 (17:45 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 11 Feb 2012 16:45:25 +0000 (17:45 +0100)
commit2db6fff8d8dbb6666424fd254527f69124df6c80
tree96d3e983d343ad28edc71b30b9956016dd74caae
parent33f90a9809e21f82731df5d91174a0767bd301ff
parent56e45ea93952d325e43d81ec5004f73bbc95536a
Merge changes If0c2f9d9,Ic2a8ad82 into release-4-5-patches

* changes:
  Fixed g_sham using more than three dimensions
  Integer multiplication that checks for overflow