Merge remote-tracking branch 'origin/master'
commit0491f4a4d0a1d6c76fdff1f306a0ec3dd6569545
authorWeblate <noreply@weblate.org>
Thu, 19 Mar 2015 12:59:33 +0000 (19 13:59 +0100)
committerWeblate <noreply@weblate.org>
Thu, 19 Mar 2015 12:59:33 +0000 (19 13:59 +0100)
tree871acb912b9d344198f6169f38c6b53f0a400186
parent0885b3bfc3a3f6cf404175571c91c4fd2086edb0
parent14d5a7b7d82bd7b8a8061384a68a00343725c113
Merge remote-tracking branch 'origin/master'