Merge branch 'master' into pygromacs
authorAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 19 Jun 2015 18:19:30 +0000 (21:19 +0300)
committerAlexey Shvetsov <alexxy@omrb.pnpi.spb.ru>
Fri, 19 Jun 2015 18:19:30 +0000 (21:19 +0300)

Trivial merge