Merge branch 'v2.0' 98/1698/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 26 Apr 2017 13:06:04 +0000 (15:06 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 26 Apr 2017 13:06:04 +0000 (15:06 +0200)
commitb0c600d21ad65893f5e7ab4522565e8f66e195e9
treecb517cc6890002bcbb950a8fd8963a35300f701e
parent57697f9ef826d2ba5490daee8ff55004d0635c7f
parent8bcea0f617454d4856cb9809f97dbe4918067ef9
Merge branch 'v2.0'

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