Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Mon, 27 Jul 2015 07:17:28 +0000 (10:17 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Mon, 27 Jul 2015 07:17:28 +0000 (10:17 +0300)

Trivial merge