Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Jul 2015 11:46:30 +0000 (14:46 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Jul 2015 11:46:30 +0000 (14:46 +0300)
commit8a9ed358b11c7181e46129f811c6f9a9805cbdd3
treed1c0ece6d0c43a4d2d3d22d9215a8a888a5058f9
parent87823c5ebe2ecab05a07cfdfd5165e53cb07c30d
parentaef61d9804d107c75e373f3e4c29db5c8f18d6a4
Merge branch 'master' into pygromacs