fix issue with merge tickets and disable do merge unless action is chosen
[gitlive] / AUTHORS
1 Alan Knowles <alan@roojs.com>