Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 24 Jul 2015 17:16:56 +0000 (20:16 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 24 Jul 2015 17:16:56 +0000 (20:16 +0300)

Trivial merge