Merge branch 'v1.1' 72/1272/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 10 Mar 2017 11:49:02 +0000 (12:49 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 10 Mar 2017 11:49:02 +0000 (12:49 +0100)
commitbaed916f90758ef7301d3d3038b39f1822412dfd
tree3e3bdbd3c68704053de39b9fc5eab5ca41db04f9
parentb05fa3cf2a09cc6e27b14bed2c0403282ceba64d
parent2ab00d215c256fb796bfb459ca846914bb1d1ac7
Merge branch 'v1.1'