Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Wed, 3 Jun 2015 20:45:55 +0000 (23:45 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Wed, 3 Jun 2015 20:45:55 +0000 (23:45 +0300)
commit3c8dae9157dc95cfecb2962e9b5909e15452f982
tree3570d45f712c887ee46445526892a211af31f862
parentd694a84c0f368251ed6e878fe86c95d876b7344a
parent99a1e1f7ada3e6718875e39eb789f24172b880ae
Merge branch 'master' into pygromacs