Merge remote-tracking branch 'origin/master'
commit006788069a337efad5811708ddac4a08578d3f42
authorWeblate <noreply@weblate.org>
Mon, 19 Jan 2015 17:41:15 +0000 (19 18:41 +0100)
committerWeblate <noreply@weblate.org>
Mon, 19 Jan 2015 17:41:15 +0000 (19 18:41 +0100)
treeb2c4933cc2d1580708ae3bc01e963f1e12dda08a
parentba202fb735f17df02af8a2833aa65d2c9ed564d4
parent3e1684263913669d47b6c824885d712b1fd207bb
Merge remote-tracking branch 'origin/master'