Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Wed, 4 Feb 2015 18:29:48 +0000 (21:29 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Wed, 4 Feb 2015 18:29:48 +0000 (21:29 +0300)

Trivial merge