Merge remote-tracking branch 'origin/master'
commit4b2af0c92c001ead2a2c84797c561743d993907f
authorWeblate <noreply@weblate.org>
Fri, 6 Feb 2015 09:25:32 +0000 (6 10:25 +0100)
committerWeblate <noreply@weblate.org>
Fri, 6 Feb 2015 09:25:32 +0000 (6 10:25 +0100)
tree275e7bb21d0f7e5091bc10fe2560b4351ca489c5
parentf659fceda4cf13b8c705dea9e4732cb4a17fcdb0
parent6f9367b1652e6b5cee652ab4729bb0253ac74b95
Merge remote-tracking branch 'origin/master'