Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Wed, 15 Jul 2015 22:03:31 +0000 (01:03 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Wed, 15 Jul 2015 22:03:31 +0000 (01:03 +0300)

Trivial merge