Merge remote-tracking branch 'origin/master'
commitbc276389cb19c9aa96cda50f42e5c1b7ef06fdac
authorWeblate <noreply@weblate.org>
Fri, 12 Jun 2015 15:03:14 +0000 (12 17:03 +0200)
committerWeblate <noreply@weblate.org>
Fri, 12 Jun 2015 15:03:14 +0000 (12 17:03 +0200)
treec42d4dc25ffe5aaf01f7ddd49fbfc8b5584c298f
parent0491bb8e410d5a4f26c0cb83be48fbdac98f2e5c
parentaa6ec4be0adb7cbed4fd667337311ba2d7f0fbc6
Merge remote-tracking branch 'origin/master'