Merge branch 'master' of git.gromacs.org:gromacs
commitfb7837d9fc8dc6181673e1dce5617173e5719263
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 30 Jun 2010 08:58:01 +0000 (30 10:58 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 30 Jun 2010 08:58:01 +0000 (30 10:58 +0200)
tree8aef85485f931d3e19c2a637731c1b2dd6250d4d
parentb6dff8fdc25c8587f7b27cf39f04148c6ae2128b
parent814207e87bce223ace5f287d61f2328c633f9887
Merge branch 'master' of git.gromacs.org:gromacs