Merge branch 'pygromacs' of git+ssh://biod.pnpi.spb.ru/alexxy/gromacs into pygromacs
authorMaxim Koltsov <maks@omrb.pnpi.spb.ru>
Fri, 26 Dec 2014 13:28:12 +0000 (16:28 +0300)
committerMaxim Koltsov <maks@omrb.pnpi.spb.ru>
Fri, 26 Dec 2014 13:28:12 +0000 (16:28 +0300)

Trivial merge