Ryan Cavanaugh c3b59d156f Merge branch 'master' into javaScriptPrototypes
# Conflicts:
#	src/compiler/binder.ts
#	src/compiler/checker.ts
#	src/harness/fourslash.ts
2015-12-01 14:34:15 -08:00
..