Merge branch 'master' of https://github.com/d-reinhold/jasmine into d-reinhold-master

- Merges #1046 from @d-reinhold
- Fixes #510
This commit is contained in:
Gregg Van Hove
2016-11-04 10:27:29 -07:00
6 changed files with 1303 additions and 1203 deletions

File diff suppressed because it is too large Load Diff