Merge remote-tracking branch 'origin/master'
commit3b290bb431d40c7a31c674991ebd52b2b7c56e54
authorWeblate <noreply@weblate.org>
Thu, 4 Jul 2013 10:02:48 +0000 (4 12:02 +0200)
committerWeblate <noreply@weblate.org>
Thu, 4 Jul 2013 10:02:48 +0000 (4 12:02 +0200)
treea7452ae13a3d786819735b4a0bb87258a4ca4853
parentb241706839a534ca23e4e4d08b3460dc2fbb4c16
parent9465f380308e9608a2a1b673688df5b2fdb44d4e
Merge remote-tracking branch 'origin/master'