Merge remote-tracking branch 'origin/master'
commit529f3408b4717025a262c607feec37d17f92a68a
authorWeblate <noreply@weblate.org>
Fri, 21 Jun 2013 18:09:02 +0000 (21 20:09 +0200)
committerWeblate <noreply@weblate.org>
Fri, 21 Jun 2013 18:09:02 +0000 (21 20:09 +0200)
treeb46c066330b7ce60ee930a33ef48b77fc31a7a05
parent6e18396e52aba0baf2e6d80ac28db83b5e31b68f
parent8d12cbb14dd74cc421cd308e6c28558f8e146eff
Merge remote-tracking branch 'origin/master'