Mohamed Hegazy 25ce5db7f3 Merge branch 'master' into es6Typings
Conflicts:
	src/harness/harness.ts
	src/lib/core.d.ts
2014-11-17 11:15:46 -08:00
..
2014-11-14 13:36:09 -08:00
2014-11-14 16:23:47 -08:00