Merge v1.0 branch into master 84/684/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Fri, 18 Nov 2016 09:19:55 +0000 (10:19 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Fri, 18 Nov 2016 11:22:05 +0000 (11:22 +0000)
commit9377e5b1e4d9ec7a03a2cbeaa9e5ceaf952e5f9d
treef19f6c94a9c54da262a0d96ce2101976aa07aba0
parent65a0b964858817a012c1d86adf18fa87b53d5f74
parent49e192d46dc5a96358f3e83cc2bb37733b66954f
Merge v1.0 branch into master

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