Merge branch 'master' of git://github.com/danvk/dygraphs
authorAdam Vartanian <flooey@gmail.com>
Tue, 10 Apr 2012 22:07:09 +0000 (18:07 -0400)
committerAdam Vartanian <flooey@gmail.com>
Tue, 10 Apr 2012 22:07:09 +0000 (18:07 -0400)
Conflicts:
dygraph-tickers.js


Trivial merge