1.0.0-pre
Merge branch 'master' of github.com:csquared/node-logfmt

Conflicts:
	package.json