Commit f3e44dd64ca7b7e4640d816e389faa583c7b4fec

Vicent Marti 2014-02-24T11:02:42

Merge pull request #2132 from ethomson/merge_doc Improve documentation for merging