Merge remote-tracking branch 'origin/master'
commit699d08efece7d15e4084af3b991642683d258a4c
authorWeblate <noreply@weblate.org>
Thu, 26 Sep 2013 18:47:38 +0000 (26 20:47 +0200)
committerWeblate <noreply@weblate.org>
Thu, 26 Sep 2013 18:47:38 +0000 (26 20:47 +0200)
tree51fa9a72a828962d033c4c3401a4aad3768cec6c
parent979b30490014f80965692a913b788c2eeb0b9a02
parent6dadb93ad124317d687fdc4182158449d6d5edc9
Merge remote-tracking branch 'origin/master'