Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate
2013-05-01 15:40:20 +02:00