tree 13880599a274e30035d8076a1f1592da99af84a4
parent 3e5ce754fd5543c4576fcbfd12b2211d4b0c190b
parent f7536d1c2401eb41729ac28645bf093c0609c047
author Luca Milanesio <luca.milanesio@gmail.com> 1430305289 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1430305289 +0100

Merge branch 'stable-2.11'

Change-Id: I5b4404e20a7159f519f705af57436a9c0682df50