commit 295e82acbbaea9e7a41176bc63d7d4d7b53abb50 Merge: 315215d fd1ab12 Author: juga0 juga@riseup.net Date: Tue Mar 5 18:46:01 2019 +0000

Merge branch 'ticket28585'

CHANGELOG.md | 300 --------------------------------- CHANGELOG.rst | 415 ++++++++++++++++++++++++++++++++++++++++++++++ docs/source/CHANGELOG.md | 1 - docs/source/CHANGELOG.rst | 1 + 4 files changed, 416 insertions(+), 301 deletions(-)