Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-10-01 23:46:18 +02:00
commit 2f19fc1f41