Merge remote-tracking branch 'origin/master'
commit3d84c3d1702acefa86b434ec76e5afaf4e4191f3
authorWeblate <noreply@weblate.org>
Mon, 3 Aug 2015 20:05:22 +0000 (3 22:05 +0200)
committerWeblate <noreply@weblate.org>
Mon, 3 Aug 2015 20:05:22 +0000 (3 22:05 +0200)
treee1715b1e07158067bea4f95b6853d7c7b2c61db7
parenteb7c7ee686ef9a19d2116a76b6e2dae8cb8a2b2b
parentf7626c6d277a30078bb223f9304e44c657b2e882
Merge remote-tracking branch 'origin/master'