Merge branch 'v2.0' 96/1696/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 26 Apr 2017 12:32:14 +0000 (14:32 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 26 Apr 2017 12:32:14 +0000 (14:32 +0200)
commit6df137c25d9e3d4ee3037df15c1c140660fbd9b3
tree2e2102427a69004b0933fe07ce1cd0e9f8e6508e
parent557e2f6e274d27d0d70d1577298c44cdc62507b5
parent99314908f1e270c682b3402491b227db71d59545
Merge branch 'v2.0'

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