Merge remote-tracking branch 'origin/master'
commitc03c809793952a43c46e5d6667dba984f30fb538
authorWeblate <noreply@weblate.org>
Wed, 10 Jul 2013 14:14:28 +0000 (10 16:14 +0200)
committerWeblate <noreply@weblate.org>
Wed, 10 Jul 2013 14:14:28 +0000 (10 16:14 +0200)
treef09e51b9cb2700a4e9a71ace137dca2e430e1b1d
parent38040575694cea162a593ea9dda3173a60ea7fdc
parent70ff3fd44b9df09f01011c008599a62b624c203d
Merge remote-tracking branch 'origin/master'