Merge remote-tracking branch 'origin/master'
commita575a906145156cb0af80d8c1c0d6e59410bbdbe
authorWeblate <noreply@weblate.org>
Tue, 18 Oct 2016 11:41:04 +0000 (18 13:41 +0200)
committerWeblate <noreply@weblate.org>
Tue, 18 Oct 2016 11:41:04 +0000 (18 13:41 +0200)
tree3c5acf34c6791e0795a9ebcf234afb40c962f0b9
parent66d51962cefd2018b5182d97c8c09edbb9833982
parent17f0af836f40751d1f9a7cf3bcbe8d49aab4a3bb
Merge remote-tracking branch 'origin/master'