tree d75fbb6fe4a51fccdd1960f3a68d87a290290da7
parent b4252460afe1962ff79da57644eba6c57699d8b8
parent aad968a357a1078742c9bac1c17056c85f4d1994
author swift-ci <swift-ci@users.noreply.github.com> 1495317787 -0700
committer swift-ci <swift-ci@users.noreply.github.com> 1495317787 -0700

Merge remote-tracking branch 'origin/swift-4.0-branch' into stable