Daniel Rosenwasser d522c88295 Merge branch 'master' into templates
Conflicts:
	src/compiler/checker.ts
	src/services/services.ts
2014-10-28 18:49:35 -07:00
..
2014-10-20 14:39:31 -07:00