Merge remote-tracking branch 'origin/master'
commitc8b6c9e87b179a214007e5f69ebb5014a4d80dd7
authorWeblate <noreply@weblate.org>
Tue, 30 Aug 2016 12:49:13 +0000 (30 14:49 +0200)
committerWeblate <noreply@weblate.org>
Tue, 30 Aug 2016 12:49:13 +0000 (30 14:49 +0200)
tree259495cc7f72765778d3322c40d8caf4eb78b47c
parent9b22a41dd533e5bf531cb3a2413864eb352d9a2e
parent89fc40a1ce7e2cf07c20c2254d8426044011f7a6
Merge remote-tracking branch 'origin/master'