Merge pull request #2741 from duerahan/master

author William Entriken <github.com@phor.net>

Mon, 27 Jun 2016 17:59:41 +0000 (13:59 -0400)

committer GitHub <noreply@github.com>

Mon, 27 Jun 2016 17:59:41 +0000 (13:59 -0400)
author William Entriken <github.com@phor.net>
Mon, 27 Jun 2016 17:59:41 +0000 (13:59 -0400)
committer GitHub <noreply@github.com>
Mon, 27 Jun 2016 17:59:41 +0000 (13:59 -0400)
diff --cc src/scales/scale.time.js

index 3ada3e5e4d6e58d3640758c3b9763816f3d61762,fbb4fbfa13a4b77a2078947a2d44ad411cd840c5..6affaebe83d4726a05a1f205c0ce079c05c5e39e

mode 100644,100755..100755
--- 1/src/scales/scale.time.js
--- 2/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
diff --cc test/scale.time.tests.js

index 27af3ed54d809776bda028c36647e7cb2533fe7e,0d1b8b8c04a2490e4760ab493e431bd77d33a65d..f3173e1c455e779187540a723350719bf6070534

mode 100644,100755..100755
--- 1/test/scale.time.tests.js
--- 2/test/scale.time.tests.js
+++ b/test/scale.time.tests.js
author	William Entriken <github.com@phor.net>
	Mon, 27 Jun 2016 17:59:41 +0000 (13:59 -0400)
committer	GitHub <noreply@github.com>
	Mon, 27 Jun 2016 17:59:41 +0000 (13:59 -0400)
		1	2
src/scales/scale.time.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/scale.time.tests.js	patch \|	diff1 \|	diff2 \|	blob \| history