Merge remote-tracking branch 'origin/master'
commit8fbe81576bde9716a7b8a97251e264dba2ac8803
authorWeblate <noreply@weblate.org>
Sat, 21 Jan 2017 10:06:09 +0000 (21 11:06 +0100)
committerWeblate <noreply@weblate.org>
Sat, 21 Jan 2017 10:06:09 +0000 (21 11:06 +0100)
tree1de5be581a9c4c44f6269874791b4ebb320d9a95
parentb2a19c5be9b8bd914e6f75526d3363f881fac90d
parentad665e2c4b9afeb0d24a78056ad0dd834e401066
Merge remote-tracking branch 'origin/master'