Merge remote-tracking branch 'origin/master'
commit4ce3f59ca8674d5e692c5aa7d08aff8796f409db
authorWeblate <noreply@weblate.org>
Sun, 21 Dec 2014 10:38:52 +0000 (21 11:38 +0100)
committerWeblate <noreply@weblate.org>
Sun, 21 Dec 2014 10:38:52 +0000 (21 11:38 +0100)
tree2bc5b7286bb02469ee25e23c679add143362f0ab
parent6099e4ac837a01a77f806971c62401465d872043
parent16a8565d5656809984e72b4be76487afdbcead3b
Merge remote-tracking branch 'origin/master'