Merge remote-tracking branch 'origin/master'
commit95f0b08128c205c946b8787ad7376332d63b7c84
authorWeblate <noreply@weblate.org>
Fri, 22 Jan 2016 11:16:16 +0000 (22 12:16 +0100)
committerWeblate <noreply@weblate.org>
Fri, 22 Jan 2016 11:16:16 +0000 (22 12:16 +0100)
treed3f004f846b0080eef509e396c3598d9c1db2ac9
parent0fc1d512c5d44160cfb04697781f7b8378419e28
parent017ec4680850d6123906e03dbd9cbe722e2f9c9d
Merge remote-tracking branch 'origin/master'