Merge changes Ica9a9fc2,I5effef05
authorFelix Dörre <felix@dogcraft.de>
Sun, 18 Feb 2018 16:00:30 +0000 (17:00 +0100)
committerGerrit Code Review <gigi-system@dogcraft.de>
Sun, 18 Feb 2018 16:00:30 +0000 (17:00 +0100)
* changes:
  chg: reword error message to match conditions
  chg: enable support to find organisation domains


Trivial merge