Merge remote-tracking branch 'origin/devel' into devel
commitc3ebb7cfcc187daeb52ff1bd5c2826ee8ea2b9ed
authorintrigeri <intrigeri@boum.org>
Wed, 16 Jan 2019 15:04:06 +0000 (16 15:04 +0000)
committerintrigeri <intrigeri@boum.org>
Wed, 16 Jan 2019 15:04:06 +0000 (16 15:04 +0000)
tree6e9b4e0eac3c151b9e74068ae0c692edd489f13d
parent98c0c3f92b3d964f660cbc9d9e33aaa8b8aae7fc
parente9ebe76552ac4140d66a49805cd62e90e9c2a7a1
Merge remote-tracking branch 'origin/devel' into devel