Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Mon, 27 Jul 2015 07:17:28 +0000 (10:17 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Mon, 27 Jul 2015 07:17:28 +0000 (10:17 +0300)
commit4fb23a1438393a48312088b77f662c30ac7fbf68
tree3df5182a90c18c31fa0326290bc13a1a81b71e8f
parent14cef496793d46312fff5d313d84c1516e821dbb
parenta04f855267ee04b810f645e184f75fe6b520b8af
Merge branch 'master' into pygromacs