Merge pull request #143 from klausw-g/plugin-tweaks

author Dan Vanderkam <dan@dygraphs.com>

Wed, 18 Apr 2012 15:21:47 +0000 (08:21 -0700)

committer Dan Vanderkam <dan@dygraphs.com>

Wed, 18 Apr 2012 15:21:47 +0000 (08:21 -0700)
author Dan Vanderkam <dan@dygraphs.com>
Wed, 18 Apr 2012 15:21:47 +0000 (08:21 -0700)
committer Dan Vanderkam <dan@dygraphs.com>
Wed, 18 Apr 2012 15:21:47 +0000 (08:21 -0700)
diff --cc dygraph.js
Simple merge
diff --cc plugins/legend.js
Simple merge
author	Dan Vanderkam <dan@dygraphs.com>
	Wed, 18 Apr 2012 15:21:47 +0000 (08:21 -0700)
committer	Dan Vanderkam <dan@dygraphs.com>
	Wed, 18 Apr 2012 15:21:47 +0000 (08:21 -0700)
		1	2
dygraph.js	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/legend.js	patch \|	diff1 \|	diff2 \|	blob \| history