Merge remote-tracking branch 'origin/master'
commit943c17cbe54fcf5458e37f72b0a05dd111f06066
authorWeblate <noreply@weblate.org>
Thu, 24 Apr 2014 09:11:49 +0000 (24 11:11 +0200)
committerWeblate <noreply@weblate.org>
Thu, 24 Apr 2014 09:11:49 +0000 (24 11:11 +0200)
tree94fe55902826fd74f6e86bb90f0b7b7a573af6d0
parentb2cf6771c0a58e7afadb5e87cdaf3bf912e3a40f
parentab8f07d86938b8348c84e1891a5f11ae9cb7f4c8
Merge remote-tracking branch 'origin/master'