Commit c254e2b641cffd47667de02f77e7f5ef3304841e

Edward Thomson 2014-02-21T08:55:30

Improve documentation for merging