Merge branch '1123-custom-error' of https://github.com/deckar01/jasmine into deckar01-1123-custom-error

- Merges #1298 from @deckar01
- Fixes #1123

src/core/Expectation.js

@@ -65,6 +65,7 @@ getJasmineRequireObj().Expectation = function() {
           matcherName: name,
           passed: result.pass,
           message: message,
+          error: result.error,
           actual: this.actual,
           expected: expected // TODO: this may need to be arrayified/sliced
         }