merge v1.0.2 -commit b1c42b6- into master 13/813/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 19 Dec 2016 17:46:09 +0000 (18:46 +0100)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Mon, 19 Dec 2016 17:46:56 +0000 (18:46 +0100)
commit2c31ee74f12d0f584c9191414ddab5ede6ea540d
tree32a35ab84a6bc91e46e20757445479727e169ac8
parent95baa27ba382b714f18a0fa2ed345af0eac2219f
parentb1c42b63ee0f8e3691454e7679b01cb31f128a90
merge v1.0.2 -commit b1c42b6- into master

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