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)
commit3fb516b5e8b861f15754428c6071688ab121bb6c
tree226c84b6ca8a227e87f5898efdec1434e52954fa
parenta009b796dc144f67ef829c01026edf178e3dfc3b
parent9f890c23ad80924d0a30f3a14f8680b7c2d6318e
Merge commit '9f890c23ad80924d0a30f3a14f8680b7c2d6318e' into fix-for-issue-451

Conflicts:
dygraph-layout.js
dygraph.js