Merge remote-tracking branch 'origin/master'
commit9f464fd861445a29ef72bea06b669618baa0a253
authorWeblate <noreply@weblate.org>
Mon, 27 Jul 2015 13:07:00 +0000 (27 15:07 +0200)
committerWeblate <noreply@weblate.org>
Mon, 27 Jul 2015 13:07:00 +0000 (27 15:07 +0200)
tree73b7ae42c83136a60f2e73e88d3ed7a4a724c2e2
parent1c73d0407b764ba25c67401e197226aeba378cc1
parent9e2e1b4c0ebd5e34dbe35ad80541606511da2d09
Merge remote-tracking branch 'origin/master'