Commits

Brian Gesiak committed 8ad9db7e38eM
Merge branch 'master' into swift-2.0 Conflicts: - Quick/DSL/DSL.swift - Quick/DSL/World+DSL.swift - QuickTests/Helpers/QCKSpecRunner.m
Merge branch 'master' into swift-2.0 Conflicts: - Quick/DSL/DSL.swift - Quick/DSL/World+DSL.swift - QuickTests/Helpers/QCKSpecRunner.m