Merge branch 'master' of git.gromacs.org:gromacs
commita706047a4dcece3ee3500e409e666ccb11267013
authorErik Lindahl <lindahl@cbr.su.se>
Fri, 30 Jul 2010 13:28:23 +0000 (30 15:28 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Fri, 30 Jul 2010 13:28:23 +0000 (30 15:28 +0200)
treea90f528d882cc7b3e62ac15eec157f1c760abffe
parentb8ad765f82ebd97c9495f584d0827f98c7a87f7d
parent7781e7887b815ff054032be668f388123254282e
Merge branch 'master' of git.gromacs.org:gromacs