From: Weblate <noreply@weblate.org>
Date: Thu, 7 May 2015 16:42:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.1~77
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/063c21d8341dbade23c21427e6c9de447b67cc16?hp=063c21d8341dbade23c21427e6c9de447b67cc16

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