Merge remote-tracking branch 'origin/master'
commit841048e3d016e398c8fc2851effa5f2185786bba
authorWeblate <noreply@weblate.org>
Thu, 29 Oct 2015 10:48:40 +0000 (29 11:48 +0100)
committerWeblate <noreply@weblate.org>
Thu, 29 Oct 2015 10:48:40 +0000 (29 11:48 +0100)
tree8c27b95ed9ef17e4d50bf4a2283c408d56e23dcb
parentdeec9b0ca396c8355988ca2205ffb222cb157779
parent10de07bb1d6e9b9016ca64f6a4b1fe52a951a12f
Merge remote-tracking branch 'origin/master'