Merge branch 'highchart-fix' of https://github.com/jstclair/DefinitelyTyped into jstclair-highchart-fix
Added getOptions to HighchartsStatic, and fixed setOptions() return type
Merge pull request #970 from jstclair/highchart-fix-2

Added getOptions to HighchartsStatic, and fixed setOptions() return type
historyjs lib.d.ts collision comment
Update winjs.d.ts to include the class ErrorFromName

From http://msdn.microsoft.com/en-us/library/windows/apps/br211689.aspx#methods, the class ErrorFromName was missing.
sammyjs Updated definitions + fixed compile errors in tests.
Merge pull request #974 from wiredprairie/patch-1

Update winjs.d.ts to include the class ErrorFromName
Added jquery External Module definition for amd module
Merge branch 'master' of https://github.com/s093294/DefinitelyTyped into s093294-master