facto
Merge branch 'master' of https://github.com/jrmbrgs/nlog

Conflicts:
	nlog.js