Merge remote-tracking branch 'origin/master'
commit599effd165623bcdd8624092cace4556bd2655fa
authorWeblate <noreply@weblate.org>
Sun, 31 Jul 2016 21:50:45 +0000 (31 23:50 +0200)
committerWeblate <noreply@weblate.org>
Sun, 31 Jul 2016 21:50:45 +0000 (31 23:50 +0200)
tree6a661b686e64902a02f32ab9fefb465395d13026
parentc06150228568a5d7f9c94b2e93eff863b3045d1e
parent7f43348e6b77f12fc4669f7e5defb582bde49911
Merge remote-tracking branch 'origin/master'