Merge remote-tracking branch 'origin/master'
commit17821c2bcbe807607edbc40c3192cb8794d05350
authorWeblate <noreply@weblate.org>
Mon, 4 Sep 2017 13:08:03 +0000 (4 15:08 +0200)
committerWeblate <noreply@weblate.org>
Mon, 4 Sep 2017 13:08:03 +0000 (4 15:08 +0200)
tree08d55ddea3c01989c906e048cb880d3fdf2a83d0
parent05dea67cbb1fea6a2f76e16f18631d067bbd711d
parentf52beffd3d6246366f26d5c08f4fdfa29682426f
Merge remote-tracking branch 'origin/master'