Merge branch 'master' of https://github.com/danvk/dygraphs into option-consolidation
authorRobert Konigsberg <konigsberg@google.com>
Thu, 27 Dec 2012 16:08:15 +0000 (11:08 -0500)
committerRobert Konigsberg <konigsberg@google.com>
Thu, 27 Dec 2012 16:08:15 +0000 (11:08 -0500)

Trivial merge