From: David Eberlein <david.eberlein@ch.sauter-bc.com>
Date: Wed, 8 May 2013 06:42:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'official/master' into per-axis-grid
X-Git-Tag: v1.0.0~29^2^2
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;ds=inline;h=75e2ab53cb9860deb0082b7bdf1bbb59eaafcc65;hp=--cc;p=dygraphs.git

Merge remote-tracking branch 'official/master' into per-axis-grid

Conflicts:
	tests/two-axes.html
---

75e2ab53cb9860deb0082b7bdf1bbb59eaafcc65