Merge branch 'pygromacs' of git+ssh://biod.pnpi.spb.ru/alexxy/gromacs into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Apr 2015 18:26:50 +0000 (21:26 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Apr 2015 18:26:50 +0000 (21:26 +0300)

Trivial merge