Merge commit '9f890c23ad80924d0a30f3a14f8680b7c2d6318e' into fix-for-issue-451
authorDavid Eberlein <david.eberlein@ch.sauter-bc.com>
Thu, 2 May 2013 08:50:24 +0000 (10:50 +0200)
committerDavid Eberlein <david.eberlein@ch.sauter-bc.com>
Thu, 2 May 2013 08:50:24 +0000 (10:50 +0200)
Conflicts:
dygraph-layout.js

1  2 
dygraph.js

diff --cc dygraph.js
Simple merge