Merge remote-tracking branch 'origin/master'
commitb6a11a16580e80358cd9fa5a9f880b7a07b3ad6c
authorWeblate <noreply@weblate.org>
Fri, 12 Jun 2015 06:31:55 +0000 (12 08:31 +0200)
committerWeblate <noreply@weblate.org>
Fri, 12 Jun 2015 06:31:55 +0000 (12 08:31 +0200)
treed8de071898519eaa6c190b316a1b5ce1b71c48bd
parent1950230fed11b6a98554fbbb4f822274376024f1
parent04dec8ba4a7fa3431c0bee870c8e0515389f79e1
Merge remote-tracking branch 'origin/master'