Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Apr 2015 18:27:01 +0000 (21:27 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Tue, 28 Apr 2015 18:27:01 +0000 (21:27 +0300)

Trivial merge