Merge branch 'master' of https://github.com/danvk/dygraphs into option-consolidation
authorRobert Konigsberg <konigsberg@gmail.com>
Sun, 30 Dec 2012 01:49:15 +0000 (20:49 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Sun, 30 Dec 2012 01:49:15 +0000 (20:49 -0500)

Trivial merge