tree 48a8da1a5c533ea408fecfb7597a180a189c6cd5
parent 33380b5e25bcbb2681d1862f67c25b7d73ef7995
parent 61f7278c83c4ec93b1b46a66169a65151532a617
author Fabio Ponciroli <ponch78@gmail.com> 1650396068 +0200
committer Fabio Ponciroli <ponch78@gmail.com> 1650396068 +0200

Merge branch 'stable-3.6'

* stable-3.6:
  Fix compilation errors against stable-3.6

Change-Id: I6b53f916bc04589d813df652ad28a4c71165d3a0