Merge remote-tracking branch 'origin/master'
commit752d592f3a7712237cee5722e69162d6880f5591
authorWeblate <noreply@weblate.org>
Tue, 21 Jul 2015 05:43:41 +0000 (21 07:43 +0200)
committerWeblate <noreply@weblate.org>
Tue, 21 Jul 2015 05:43:41 +0000 (21 07:43 +0200)
treef0e2332858abf4a74f3a0532b4cd7426e47eaefd
parent90ae994524c759eb7fe59aca34dbc2bd613470a0
parentc6b6b1d7d43050b801079b47e47f0e6fc1162cf5
Merge remote-tracking branch 'origin/master'