Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-08 09:50:19 +01:00
commit cd2300647b