From: Benjamin Auder <benjamin.auder@somewhere>
Date: Thu, 16 Mar 2017 15:52:22 +0000 (+0100)
Subject: Merge branch 'master' of auder.net:valse
X-Git-Url: https://git.auder.net/doc/html/%7B%7B%20path%28%27fos_user_resetting_request%27%29%20%7D%7D?a=commitdiff_plain;h=1c45d8e4f6fd4209d26709f17a58920218ee828d;p=valse.git

Merge branch 'master' of auder.net:valse
---

1c45d8e4f6fd4209d26709f17a58920218ee828d