Merge branch 'master' of git.gromacs.org:gromacs
commit0c6545731c67a91b4820ccf49f5e78bc7086729a
authorErik Lindahl <lindahl@cbr.su.se>
Fri, 30 Jul 2010 12:55:38 +0000 (30 14:55 +0200)
committerErik Lindahl <lindahl@cbr.su.se>
Fri, 30 Jul 2010 12:55:38 +0000 (30 14:55 +0200)
tree49e572843d4818b1c017982c24fa3a0e2bd517a6
parentd2b8e26c23d7bb190977486db84ad18d5e1a7a71
parent9d1d13156ef6f2909de9c44854fb6cedc0c22395
Merge branch 'master' of git.gromacs.org:gromacs