Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-06-01 11:24:53 +02:00
commit b7896547ed

File diff suppressed because one or more lines are too long