Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-12-24 08:55:34 +01:00
commit 9469aeb41b