Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Sun, 2 Aug 2015 19:36:37 +0000 (22:36 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Sun, 2 Aug 2015 19:36:37 +0000 (22:36 +0300)

Trivial merge