Merge remote-tracking branch 'origin/master'
commit23953011c3c62c5cd58c806db9f882ea7bdac909
authorWeblate <noreply@weblate.org>
Tue, 17 Mar 2015 12:48:59 +0000 (17 13:48 +0100)
committerWeblate <noreply@weblate.org>
Tue, 17 Mar 2015 12:48:59 +0000 (17 13:48 +0100)
treeb4bc54868926073eaea97ef576903ff56e068a91
parent3afbb9f06e6e0b1c57016d04019a30fd447e5747
parent0cdceae0c616997bfc77048462f46070f6958542
Merge remote-tracking branch 'origin/master'