tree 8de07be9355e0ec76a3a90696b9e3a62f791e52c
parent 035d3ab7ec8496feaa4e3559466bb501c776700d
parent 5680d0321c899cd9d52b600632d8405b6dd3982e
author Luca Milanesio <luca.milanesio@gmail.com> 1448871113 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> 1448871510 +0000

Merge branch 'stable-2.11' into 'master'

No commits included, merge executed only for release-management purposes
and applying future fixes on both stable-2.11 and master.

Change-Id: I0fe480719f3f9083d44bfaa01dbd9ef43591ccca