Merge remote-tracking branch 'origin/master'
commitf318edf76e72cf0829393496185c651717f2582d
authorWeblate <noreply@weblate.org>
Tue, 22 Oct 2013 13:00:20 +0000 (22 15:00 +0200)
committerWeblate <noreply@weblate.org>
Tue, 22 Oct 2013 13:00:20 +0000 (22 15:00 +0200)
tree30cbd551b663219e992dd2eb032d7f2e4ae21eec
parentc58d721ba68bf2c01a3ab91f4da6437a33fc309e
parent8eeaebcc21c9faa8cec33e9c152188c24fdbfb43
Merge remote-tracking branch 'origin/master'