Merge remote-tracking branch 'origin/master'
commit78390b5d0feee13416b2ad887a77b9372d96c7bb
authorWeblate <noreply@weblate.org>
Mon, 26 Jan 2015 08:52:20 +0000 (26 09:52 +0100)
committerWeblate <noreply@weblate.org>
Mon, 26 Jan 2015 08:52:20 +0000 (26 09:52 +0100)
treee4e82f7df74c8a1f337df7557dbb08ca00236707
parentb02db4bf35c9fc394f4af154b8136a0f3a988c52
parent4dc0f8e61379f561f9a2d0b4476c69d95f8860c0
Merge remote-tracking branch 'origin/master'