Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Wed, 15 Jul 2015 22:03:31 +0000 (01:03 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Wed, 15 Jul 2015 22:03:31 +0000 (01:03 +0300)
commitd6a65fe9a928c43331a4381320483d884eb398a7
treeb44731f31cec7dc3135d9a4268d1ed594a577725
parent1241cd15da38bf7afd65a924100730b04e430475
parenta772ad17234cccd6ec9572f9904a03266bfbd129
Merge branch 'master' into pygromacs