Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-07 17:26:38 +01:00
commit 11c48a0f0c