Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 17 Jul 2015 06:46:25 +0000 (09:46 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 17 Jul 2015 06:46:25 +0000 (09:46 +0300)

Trivial merge