Merge remote-tracking branch 'origin/master'
commit26c49389708af48fae25268583c0caa23ad54fe4
authorWeblate <noreply@weblate.org>
Sun, 11 Jan 2015 10:51:14 +0000 (11 11:51 +0100)
committerWeblate <noreply@weblate.org>
Sun, 11 Jan 2015 10:51:14 +0000 (11 11:51 +0100)
treed31ebf03d74d4116483f168140e809466e38d02b
parente9c4fe3b284cd1b7bf272d339bf2f93dd1e533d1
parent4884e088ad37ced660529e7a9afb14bf8bdd39b8
Merge remote-tracking branch 'origin/master'