Merge branch 'pygromacs' of git+ssh://biod.pnpi.spb.ru/alexxy/gromacs into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Apr 2015 18:26:50 +0000 (21:26 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Apr 2015 18:26:50 +0000 (21:26 +0300)
commit1acb38838c1d4c9242ecfc90e3ea7f3f6d6a3aad
tree85974e4e69f742bbb6628db1b73a0d06100aae11
parent1231825f0766cf54d13ca1d32047c41277b50e73
parentdc8f62393fe478dd7118b68e907576cc9e7ed42a
Merge branch 'pygromacs' of git+ssh://biod.pnpi.spb.ru/alexxy/gromacs into pygromacs