Merge remote-tracking branch 'origin/master'
commitc898c2f11cc0834b8d68fa9a8f36ffca1fb3fa67
authorWeblate <noreply@weblate.org>
Wed, 30 Oct 2013 12:55:27 +0000 (30 13:55 +0100)
committerWeblate <noreply@weblate.org>
Wed, 30 Oct 2013 12:55:27 +0000 (30 13:55 +0100)
tree0d92f205490ca10ee931c7c499f62cb50b634c44
parentcd49b6cb108c2943bdd15b93cce7a19afa5e07a7
parentd720824da02c4eaf228285d86e72d85e2d62e230
Merge remote-tracking branch 'origin/master'