Merge "add: email-management-api"
authorBenny Baumann <BenBE1987@gmx.net>
Sun, 16 Oct 2016 16:22:28 +0000 (18:22 +0200)
committerGerrit Code Review <gigi-system@dogcraft.de>
Sun, 16 Oct 2016 16:22:28 +0000 (18:22 +0200)

Trivial merge