Merge branch 'v2.0' 67/2167/1 v3.0.0 v3.0.0rc v3.0.0rc16 v3.0.0rc17 v3.0.0rc2 v3.0.1
authortierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 13 Sep 2017 12:10:56 +0000 (14:10 +0200)
committertierno <alfonso.tiernosepulveda@telefonica.com>
Wed, 13 Sep 2017 12:10:56 +0000 (14:10 +0200)
commitfb9b059a4629dacbb11644b8950ff5a8b404d273
tree3adf58c54c9036204d4e662871265bf5f8e36cd9
parentcbccaab896302e15b1c7e91cfa76033b1be049ff
parent338e9983982f9847e96da4419bb5c9f50a5dfefb
Merge branch 'v2.0'