tree 24dda8e580498a6abf239af4c69fde987722c23a
parent 08593105e270b0f13d0e12229a3032228f69cb66
parent c4b74cc33868d5fca1ce4fe6bcdfb916c567d4bd
author David Pursehouse <dpursehouse@collab.net> 1557817497 +0200
committer David Pursehouse <dpursehouse@collab.net> 1557817497 +0200

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix selecting AutoMerge

Change-Id: Ia1ca45e3dffdb380e65640d0374251a61cc36c60