Commit 26564d80aa7b340f07e9c5b96457928ebadcc606

Edward Thomson 2014-04-23T19:26:58

merge: default checkout strategy for should be SAFE