Merge branch 'option-consolidation' of https://github.com/kberg/dygraphs
authorRobert Konigsberg <konigsberg@gmail.com>
Sat, 29 Dec 2012 17:39:23 +0000 (12:39 -0500)
committerRobert Konigsberg <konigsberg@gmail.com>
Sat, 29 Dec 2012 17:39:23 +0000 (12:39 -0500)

Trivial merge