Merge pull request #292 from joanpau

author Dan Vanderkam <danvdk@gmail.com>

Wed, 5 Nov 2014 14:40:38 +0000 (09:40 -0500)

committer Dan Vanderkam <danvdk@gmail.com>

Wed, 5 Nov 2014 14:40:38 +0000 (09:40 -0500)
author Dan Vanderkam <danvdk@gmail.com>
Wed, 5 Nov 2014 14:40:38 +0000 (09:40 -0500)
committer Dan Vanderkam <danvdk@gmail.com>
Wed, 5 Nov 2014 14:40:38 +0000 (09:40 -0500)
diff --cc dygraph-options-reference.js
Simple merge
diff --cc dygraph-utils.js
Simple merge
diff --cc dygraph.js
Simple merge
author	Dan Vanderkam <danvdk@gmail.com>
	Wed, 5 Nov 2014 14:40:38 +0000 (09:40 -0500)
committer	Dan Vanderkam <danvdk@gmail.com>
	Wed, 5 Nov 2014 14:40:38 +0000 (09:40 -0500)
		1	2
dygraph-options-reference.js	patch \|	diff1 \|	diff2 \|	blob \| history
dygraph-utils.js	patch \|	diff1 \|	diff2 \|	blob \| history
dygraph.js	patch \|	diff1 \|	diff2 \|	blob \| history