Merge remote-tracking branch 'origin/master'
commit2402a0b05394750c66a36695ab8155245247f181
authorWeblate <noreply@weblate.org>
Wed, 3 Feb 2016 18:49:18 +0000 (3 19:49 +0100)
committerWeblate <noreply@weblate.org>
Wed, 3 Feb 2016 18:49:18 +0000 (3 19:49 +0100)
treefafa531e544bb98589b4ac03cd67e869efb4a4df
parent5e0dc6b13900180b17decfc4f41d6f53a368660c
parentc2b41b829a10a5a6ff838f83c340620e4825c4cd
Merge remote-tracking branch 'origin/master'