Merge remote-tracking branch 'origin/master'
commite8580793fc86da91462372a305dceb08ce60c716
authorWeblate <noreply@weblate.org>
Tue, 6 Jan 2015 10:02:40 +0000 (6 11:02 +0100)
committerWeblate <noreply@weblate.org>
Tue, 6 Jan 2015 10:02:40 +0000 (6 11:02 +0100)
treeefc1fbf3c119c61e0746c38623af3112158fe5a6
parent79b54d2478b67dc7a7d6f9b99a3ebcb5a307751b
parentfac655454fec1f78d092001b732233f549945e31
Merge remote-tracking branch 'origin/master'