From: Weblate Date: Thu, 21 May 2015 12:30:06 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' X-Git-Tag: 1.1~74 X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/946e901da94f48deb9ea6a61438e1696030cc4eb?ds=sidebyside;hp=946e901da94f48deb9ea6a61438e1696030cc4eb Merge remote-tracking branch 'origin/master' ---