Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Mon, 27 Jul 2015 18:53:14 +0000 (21:53 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Mon, 27 Jul 2015 18:53:14 +0000 (21:53 +0300)
commit87823c5ebe2ecab05a07cfdfd5165e53cb07c30d
tree2a2672431a19fd24faa19057a2e158cdd728d80a
parent4fb23a1438393a48312088b77f662c30ac7fbf68
parentac65de032cce28672cb4e14cd9d83d853855a43a
Merge branch 'master' into pygromacs