Merge remote-tracking branch 'origin/master'
commit306613722dd33b64aab64db9f504c21659dc8f9e
authorWeblate <noreply@weblate.org>
Thu, 12 Sep 2013 16:07:47 +0000 (12 18:07 +0200)
committerWeblate <noreply@weblate.org>
Thu, 12 Sep 2013 16:07:47 +0000 (12 18:07 +0200)
tree3c217a175553db6d18843026946786a8d60b81c1
parentd15d3c6a3834d9ff147827f19cc2aabbc77ddfab
parent7cde4686699b318b0e098cf23b06dbc02d9428c7
Merge remote-tracking branch 'origin/master'