tree 6a75d300bb3a0dad20512da3b62b7cc81a7720a1
parent 93171d96f7875f4685605dc4c11a64af16a4485b
author Luca Milanesio <luca.milanesio@gmail.com> 1430295904 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1430305038 +0100

Merge branch 'stable-2.10' into stable-2.11

Change-Id: I45d085503305d3f9d0bcc456c111caa5f70837ed