Merge remote-tracking branch 'origin/master'
commit282eb4bcdd73d23f38ddb90284107fac56c6235f
authorWeblate <noreply@weblate.org>
Thu, 24 Oct 2013 12:25:43 +0000 (24 14:25 +0200)
committerWeblate <noreply@weblate.org>
Thu, 24 Oct 2013 12:25:43 +0000 (24 14:25 +0200)
treef9371de86e2ee9562b4c0b89ec8f47f93011109a
parentbf39bc901b4c0e0a3906e9e5fa1c83de806f7aff
parent34b2d93a4830abfe64e2183258484d7bb524b3f7
Merge remote-tracking branch 'origin/master'