Merge remote-tracking branch 'origin/master'
commit84867b45f58f50a260592e7ac5169cac2f40fe50
authorWeblate <noreply@weblate.org>
Mon, 24 Jun 2013 13:06:40 +0000 (24 15:06 +0200)
committerWeblate <noreply@weblate.org>
Mon, 24 Jun 2013 13:06:40 +0000 (24 15:06 +0200)
tree0024a29f1a66735b702efbc1bd8c0215fc67ad29
parentc017c71f1ff9c1ebbe98cc33690cb7f2ebbc62e8
parent731e1f2d79e8377563623bb57c7b7e8e6f4aa5e5
Merge remote-tracking branch 'origin/master'