tree f19f6c94a9c54da262a0d96ce2101976aa07aba0
parent 65a0b964858817a012c1d86adf18fa87b53d5f74
parent 49e192d46dc5a96358f3e83cc2bb37733b66954f
author tierno <alfonso.tiernosepulveda@telefonica.com> 1479460795 +0100
committer tierno <alfonso.tiernosepulveda@telefonica.com> 1479468125 +0000

Merge v1.0 branch into master

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