diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-07-18 10:33:58 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-07-18 10:33:58 +0200 |
commit | 4c220c4ac2302b6c0a535c1099f2d393d57049c6 (patch) | |
tree | 76036635bff9d53416f0de68c266dd989a30de45 | |
parent | deccc54004cbe88ddbf8f3f951d3178dc0693189 (diff) | |
parent | 6dbde8d731f221b027c0c60b772ba82dad759943 (diff) |
Merge commit '6dbde8d731f221b027c0c60b772ba82dad759943'
Fixes #3709