Sam Jaffe 49092d3e35 Merge branch 'master' into predefs %!s(int64=6) %!d(string=hai) anos
..
logger 49092d3e35 Merge branch 'master' into predefs %!s(int64=6) %!d(string=hai) anos