tree 4b408c23e644ac49d8e24e1e911b106f4de1523c
parent 73883c12bc382775663eb605d3ee143f65496bb4
parent 831a65ffa7d9a255cfdd78b395ca6be2b64d781c
author Simon Butcher <simon.butcher@arm.com> 1460294671 +0100
committer Simon Butcher <simon.butcher@arm.com> 1460294671 +0100

Merge branch 'iotssl-683-travis-failing-intermittently'