Merge branch 'master' of git.gromacs.org:gromacs
commit966e180bfa8c8035b4ef46f1f994f9e705e73fd6
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Fri, 2 Jul 2010 12:14:04 +0000 (2 14:14 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Fri, 2 Jul 2010 12:14:04 +0000 (2 14:14 +0200)
treefbeb5efa3ff62e7c3acc6aa1321d0b25a9e7a4d6
parentd657191b2ffeba74ed2ed06e4289188014bf4e23
parentaae9115b5a61dcb780a956a1b10c29fee8846371
Merge branch 'master' of git.gromacs.org:gromacs