From: Niki <david.roulet@uclouvain.be>
Date: Fri, 22 Mar 2019 13:45:57 +0000 (+0100)
Subject: merge with master
X-Git-Tag: fanfix-3.0.1~29^2~172
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;ds=sidebyside;h=a43e4f72629d04cd3122bde830b6e4925fd3aa91;hp=a43e4f72629d04cd3122bde830b6e4925fd3aa91;p=fanfix.git

merge with master
---