Merge remote-tracking branch 'origin/master'
commit830a7b332b2809ff20a8bd2d031a7239f5348594
authorWeblate <noreply@weblate.org>
Wed, 21 Dec 2016 18:01:17 +0000 (21 19:01 +0100)
committerWeblate <noreply@weblate.org>
Wed, 21 Dec 2016 18:01:17 +0000 (21 19:01 +0100)
tree3ae5f85924b4091259321a77bc5cda2850cab3b4
parentbca84af8bd03ee43759da9191c1d170197164f8c
parent4befa5c4fc7c0d915b2fb38a6af6ead25637866a
Merge remote-tracking branch 'origin/master'