From: Weblate <noreply@weblate.org>
Date: Mon, 18 May 2015 12:30:32 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~76
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/896af1948aae9c3f48f10cff3752f926347d04f4?ds=sidebyside;hp=--cc

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

896af1948aae9c3f48f10cff3752f926347d04f4