From: Weblate <noreply@weblate.org>
Date: Sat, 5 Mar 2016 11:31:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.2.0~37
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/1a0308acfde9640228bfa39965773abb24500ae0

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

1a0308acfde9640228bfa39965773abb24500ae0