Merge remote-tracking branch 'origin/master'
commitcccb05edfcef8c83589c3a297d134b74176b7fba
authorWeblate <noreply@weblate.org>
Mon, 9 Feb 2015 15:32:48 +0000 (9 16:32 +0100)
committerWeblate <noreply@weblate.org>
Mon, 9 Feb 2015 15:32:48 +0000 (9 16:32 +0100)
tree40638138b0b7739cc5c7a1d83f8ffe130f65df3a
parent5661cfff54ebe9766ec2dffce557d45a0052662f
parent00ba48b70155eff2bce9c60fb121d9178255a680
Merge remote-tracking branch 'origin/master'