Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2013-07-03 18:33:29 +02:00
commit e118311644