merge v1.0.2 -commit 8940f6c- into master 14/814/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 19 Dec 2016 17:50:49 +0000 (18:50 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 19 Dec 2016 17:51:11 +0000 (18:51 +0100)
commita07bb94512b45d83da8ae3fdcc42c9f2084a0fa0
treeac96cbae6881a2f852027705ddbf52dce224daa6
parent87505141528f5528a1f354d2b913f36a6e445b47
parent8940f6c1341c3fa60bf0c20727b65dc79d345d88
merge v1.0.2 -commit 8940f6c- into master

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