Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-05-28 12:12:55 +02:00
commit 6e57f319de

File diff suppressed because it is too large Load diff