From: Benjamin Auder <benjamin.auder@somewhere>
Date: Wed, 15 Feb 2017 15:23:30 +0000 (+0100)
Subject: Merge branch 'master' of auder.net:talweg
X-Git-Url: https://git.auder.net/doc/current/%7B%7B%20path%28%27fos_user_resetting_request%27%29%20%7D%7D?a=commitdiff_plain;h=31f7d913d4a99d0a4db9bcfe40e31cebf90b22e6;p=talweg.git

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

31f7d913d4a99d0a4db9bcfe40e31cebf90b22e6