Merge remote-tracking branch 'origin/master'
commitc424febdbb1b73029ba1146cdcf8922ccf47a501
authorWeblate <noreply@weblate.org>
Sat, 29 Jun 2013 12:38:55 +0000 (29 14:38 +0200)
committerWeblate <noreply@weblate.org>
Sat, 29 Jun 2013 12:38:55 +0000 (29 14:38 +0200)
tree300ab1d7a4df1714e4bcd2243d399ca41eace194
parent53dc7476287cdcc8b958897b24a476ac3d7349ef
parentb69520f8cb58bbcf9500d285670b00d97ad1feb5
Merge remote-tracking branch 'origin/master'