Merge remote-tracking branch 'origin/master'
commit162c9e6c676097186f1924504be0880d662d9679
authorWeblate <noreply@weblate.org>
Wed, 21 Jan 2015 17:53:05 +0000 (21 18:53 +0100)
committerWeblate <noreply@weblate.org>
Wed, 21 Jan 2015 17:53:05 +0000 (21 18:53 +0100)
tree37fbf09ac3c57461d39f0290b9748cbfa794b413
parent5c4c6c037e1b5d6107b4c0e786c0edddfd1f682c
parente1a9e02fc00b0e2a8a197e476c34ea43a3f900b1
Merge remote-tracking branch 'origin/master'