tree b36f612a75d9aaa2c6e764988459342a19a84e95
parent 585221b4627656b7036d548c9747d7dfea247b98
parent b6c75f934f88baa5534ceec364f539b43082e675
author Antonio Barone <syntonyze@gmail.com> 1601915156 +0200
committer Antonio Barone <syntonyze@gmail.com> 1601915156 +0200

Merge branch 'stable-3.2' into master

* stable-3.2:
  Ensure All-Users:refs/meta/external-ids doesn't cause split-brains

Change-Id: I2e46a2f49b87d4e6382930e31bddeef32ebc1b95