Merge remote-tracking branch 'origin/master'
commit28231aa51c09276b4977a3e401471a3704b8271e
authorWeblate <noreply@weblate.org>
Mon, 7 Oct 2013 10:22:33 +0000 (7 12:22 +0200)
committerWeblate <noreply@weblate.org>
Mon, 7 Oct 2013 10:22:33 +0000 (7 12:22 +0200)
treef560945bade78da9172bdf161270aab5c4b23ca6
parentdc5949568f3ff454eb9653684df60e871d1f124c
parente5503d856b02e145a06ad799a222f7218c3b36d5
Merge remote-tracking branch 'origin/master'