Merge remote-tracking branch 'origin/master'
commit9ebd1260d0cbb2baf92ae93d794b8a3998cf65a7
authorWeblate <noreply@weblate.org>
Mon, 16 Mar 2015 12:04:08 +0000 (16 13:04 +0100)
committerWeblate <noreply@weblate.org>
Mon, 16 Mar 2015 12:04:08 +0000 (16 13:04 +0100)
tree375ffff79d0f872a94b0469064f67a90fd205365
parent0de31a770b2099f6ee0cd7939d47383a4febba51
parent4b1f7490d8919e8deb5552d8265a6f3aea334796
Merge remote-tracking branch 'origin/master'