Merge branch 'master' of github.com:int32at/log.js · int32at/log.js@fdc24e5 · GitHub

Commit

Merge branch 'master' of github.com:int32at/log.js

Browse files

Conflicts:
	dist/log-0.1.4.js
	dist/log-0.1.4.min.js

Loading branch information

int32at committed Nov 11, 2013

2 parents 57e26c6 + 3df5d06 commit fdc24e5