tree db672311c78422fd02ef475accd79831a3dad47e
parent 9cb30d3eec35ed367462a720a08f5f6fca26a670
parent e93d258f0b9178732f51025b6a0cdbee597a78a4
author Luca Milanesio <luca.milanesio@gmail.com> 1782989171 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1782989171 +0100

Merge branch 'stable-3.14'

* stable-3.14:

Change-Id: Ic8d41a6964ccc6d1a549cb0b40b52e801cc3ac9b