merge v1.0 commit 9aea043 on master 48/748/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Tue, 29 Nov 2016 17:14:19 +0000 (18:14 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Tue, 29 Nov 2016 17:15:29 +0000 (18:15 +0100)
commit642c468e0a4233ecc431aede8fe5e3f1c9f5d6f4
treecce8007c49277430264c3e928ce9c3733bf4243e
parentc01b383feb498d884fe1f580e7109ef17990257c
parent9aea04342798408bf0afbfec97b90a42392feb09
merge v1.0 commit 9aea043 on master

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