Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Jul 2015 13:56:52 +0000 (16:56 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Jul 2015 13:56:52 +0000 (16:56 +0300)

Trivial merge