Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-12-23 19:21:10 +01:00
commit 97152fc3d2