Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-07 09:58:36 +01:00
commit b5c099432f

File diff suppressed because one or more lines are too long