Merge remote-tracking branch 'origin/master'
commitde024be55893a9ca732dd2e96d3c0bc59e3a2492
authorWeblate <noreply@weblate.org>
Wed, 17 May 2017 13:44:03 +0000 (17 15:44 +0200)
committerWeblate <noreply@weblate.org>
Wed, 17 May 2017 13:44:03 +0000 (17 15:44 +0200)
tree77988ba6da15a34b7bfb98f431cc8d6a3c67dddc
parent0f658ad17d9865144ce31f6b8255212ef34eebc1
parentea5640fd9cd1c323dc3fa3d7db2d01ac4b239e89
Merge remote-tracking branch 'origin/master'