Merge remote-tracking branch 'origin/master'
commitb2a37f7b5d9893df6b9e54127b6be2801a4df0dd
authorWeblate <noreply@weblate.org>
Wed, 14 Jan 2015 10:43:00 +0000 (14 11:43 +0100)
committerWeblate <noreply@weblate.org>
Wed, 14 Jan 2015 10:43:00 +0000 (14 11:43 +0100)
tree79d947d64abd01396ef911f974bc60b06df14add
parent8fe6b24b09aac3444048194029a33ee93c8a80f0
parentbb12c8f4899fa5a8d63ef98199803d054b18ca75
Merge remote-tracking branch 'origin/master'