From: Weblate <noreply@weblate.org>
Date: Fri, 26 Aug 2016 21:14:13 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.2.0~24
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/007a65603bef02ac7eeccaebaa5c643fc69f031b?ds=sidebyside

Merge remote-tracking branch 'origin/master'
---

007a65603bef02ac7eeccaebaa5c643fc69f031b