tree 5a11165275e905ef4b19fe03ca88e8f81a5eb560
parent 6ef0e93880e63b9b213dfdcfeb6716c6d39f743e
parent 2eef0747a0301d3f355860c4ba2a4ce58239c173
author Steve Gravrock <sgravrock@pivotal.io> 1510336905 -0800
committer Steve Gravrock <sgravrock@pivotal.io> 1510336905 -0800

Merge branch 'feature/allow-callfake-to-be-async' of https://github.com/mrlannigan/jasmine into merge-test

    - Merges #1448 from @mrlannigan