tree 74ffd2dfd39ba0d69bcc2236ddba1dacae3e3a31
parent d1fe405788e8c9e3b4e9f04bdb8d904aee4d3a5a
parent e271462f845e46f7e38e020f03e7fd7988c72bfb
author Hugo Arès <hugo.ares@ericsson.com> 1494463999 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1494464109 -0400

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Fix compilation error

Change-Id: Ib6c85b4b55754ccc4acbc29841672bca78b3d355