Merge remote-tracking branch 'origin/master'
commitb6fc24a56c3acc9de7e429f03f11f70e1e422131
authorWeblate <noreply@weblate.org>
Sun, 8 Jan 2017 09:28:23 +0000 (8 10:28 +0100)
committerWeblate <noreply@weblate.org>
Sun, 8 Jan 2017 09:28:23 +0000 (8 10:28 +0100)
treee8b5e6bcc1466613df2a434a9ffa36101c727fb0
parent11311c8b4150360ae41de05ee98957696479f6de
parent71a2f600e715e698c950eb5fb9e115ed1dd9d520
Merge remote-tracking branch 'origin/master'