Merge branch 'v2.0' 63/1863/1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 24 May 2017 09:23:28 +0000 (11:23 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 24 May 2017 09:23:28 +0000 (11:23 +0200)
commitb36e75da99170c650c999ab2b985a14f3b9a7b5a
treef84a5e8015ea3fdd5568618458640efa1d1bac26
parentae6b3e6fe61e24460efa0f525803b398617892fa
parentec66e9ac6d550af4dcef27d786adc1a41bc30bbc
Merge branch 'v2.0'