Merge remote-tracking branch 'origin/master'
commit73f1007c3586e7760001baf5066df50dd96ee45b
authorWeblate <noreply@weblate.org>
Mon, 28 Nov 2016 04:57:38 +0000 (28 05:57 +0100)
committerWeblate <noreply@weblate.org>
Mon, 28 Nov 2016 04:57:38 +0000 (28 05:57 +0100)
treeb9240ea6bf75473ba291cd71cddc0d79f4c16455
parent89f2305cb5000644f7883e1882a5a0c904086033
parent420cb4ff7afdd8e061216c2b15a6e72fc719be67
Merge remote-tracking branch 'origin/master'