tree 2ffa9c7b9fe78d35dc0f325123c0d8beceb6fe72
parent 42a97ac6937c49cbcbffcbd645aee558123f22b1
parent 3dabd6a145fc8807a8c02de60d5fe876faa01a56
author Gilles Peskine <Gilles.Peskine@arm.com> 1518625242 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> 1518625242 +0100

Merge branch 'pr_1135' into development-proposed