Merge remote-tracking branch 'origin/master'
commitfbf9c6fd3757e52c284ca3cfff938c8e256c09d9
authorWeblate <noreply@weblate.org>
Tue, 30 Jul 2013 12:35:21 +0000 (30 14:35 +0200)
committerWeblate <noreply@weblate.org>
Tue, 30 Jul 2013 12:35:21 +0000 (30 14:35 +0200)
tree2b200491d72a68a77836aff894c392d01735b6a3
parent06deba0f6d177e795d414b3e3e1ede40ee58a6d6
parentfa59114e9298e773db0fec42ceebdf7ff26e4b00
Merge remote-tracking branch 'origin/master'