Merge remote-tracking branch 'origin/master'
commitec27eb7f6d842dd92c683e7d7467f18a659821bb
authorWeblate <noreply@weblate.org>
Mon, 3 Aug 2015 21:02:29 +0000 (3 23:02 +0200)
committerWeblate <noreply@weblate.org>
Mon, 3 Aug 2015 21:02:29 +0000 (3 23:02 +0200)
tree2c32860f83c88d7cc7101d722f165f3fe462ea53
parent9c4269edc6d4acbf061ca68b5c4929fb10f5d10e
parentea383a79920c20e5262a525dbe123ae3f5663f83
Merge remote-tracking branch 'origin/master'