tree 972f75d42f91a4596838e622ddee6a98c8bab670
parent 37af8e5577ed8d671c3d99ce2b4a2f5d2ebde787
parent 52d1b264c16886429bd88118dd59a407235635c8
author Han Seoul-Oh <laughinghan@gmail.com> 1460317347 -0700
committer Han Seoul-Oh <laughinghan@gmail.com> 1460317347 -0700

Merge branch 'master' into fix.sin-squared

 Conflicts:
	test/unit/css.test.js
	#607 also appended a test