Merge remote-tracking branch 'origin/master'
commit96c7041a63a09cbdbf19fda2dcf72435b0739931
authorWeblate <noreply@weblate.org>
Thu, 12 Sep 2013 08:02:56 +0000 (12 10:02 +0200)
committerWeblate <noreply@weblate.org>
Thu, 12 Sep 2013 08:02:56 +0000 (12 10:02 +0200)
tree22885ef1219343361ad8c0b20c68730dfdcee384
parentff3f36036ee16894b093cadc161f643c7cc874fd
parent072ed2aed44062b414fb5265772eaec29e673f69
Merge remote-tracking branch 'origin/master'