Merge branch 'stable' into devel
commit240051ffbd8b605fc11e117e9363ea5c5012737e
authorintrigeri <intrigeri@boum.org>
Wed, 13 Feb 2019 16:14:59 +0000 (13 16:14 +0000)
committerintrigeri <intrigeri@boum.org>
Wed, 13 Feb 2019 16:14:59 +0000 (13 16:14 +0000)
treec37d673113a5b26773a67037ee439c0721b69a28
parentf15e34873bcf0d729d7c91084c2657f3562c3533
parentff6c9b187c285739946a06cfe357eb195b1b5e3c
Merge branch 'stable' into devel