Merge branch v1.0 (commit fb1987b) into master 90/690/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 21 Nov 2016 13:58:05 +0000 (14:58 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 21 Nov 2016 14:05:28 +0000 (15:05 +0100)
commit06ac4cc594385037ee5369e86dd62ab1a00df8e6
treefc93a1352b16f739b0551c189f2442f5087d3b05
parenteb7874615b74d3f5e7b0123c6e1dc667adff5681
parentfb1987be8f7b90e527c7596bd31a21fa8c0245f9
Merge branch v1.0 (commit fb1987b) into master

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