tree 569a05f78393a9c673303318b60aaa088b7eaa90
parent 45483bf232a8ad3d7d5106f688adb2b6f54309f6
parent 114050ebb5d734d4e45ee2584a7a48081791dc8e
author tierno <alfonso.tiernosepulveda@telefonica.com> 1500031524 +0200
committer tierno <alfonso.tiernosepulveda@telefonica.com> 1500031524 +0200

Merge branch 'v2.0' tag 2.0.2

Change-Id: I9f418d8247af586a2de3d3cf736d26950d74ccf0
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>