Merge remote-tracking branch 'origin/master'
commit39ca4702a0c1f5e0f60d7b46304f39d3d32bbe62
authorWeblate <noreply@weblate.org>
Thu, 24 Apr 2014 11:12:05 +0000 (24 13:12 +0200)
committerWeblate <noreply@weblate.org>
Thu, 24 Apr 2014 11:12:05 +0000 (24 13:12 +0200)
tree8611363bb1c487e314a28c614f4115b78c1a7782
parent3567491c0dcb7cdd340906398035e37da5335ea3
parentb2e136e3f1a2d61c847df4748845cec0b6aad1c7
Merge remote-tracking branch 'origin/master'