Commit 958950b6e077f09821c164d0897e66eca553375c

Edward Thomson 2015-05-01T13:53:46

stash: document merge conflicts