Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Mon, 27 Jul 2015 18:53:14 +0000 (21:53 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Mon, 27 Jul 2015 18:53:14 +0000 (21:53 +0300)

Trivial merge