Merge branch 'master' into v2.0 29/1629/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 21 Apr 2017 12:18:06 +0000 (14:18 +0200)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 21 Apr 2017 12:18:06 +0000 (14:18 +0200)
commitd573573c267f0db9ee21c454ed2a5a086967c81e
tree07239d6c42f4bfeb58920bc0c2802888b73b4460
parent1c385a3ed806e8144a837199816465e2e3e07085
parent557e2f6e274d27d0d70d1577298c44cdc62507b5
Merge branch 'master' into v2.0