Merge branch 'master' into v1.1 79/1279/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 10 Mar 2017 13:36:53 +0000 (14:36 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 10 Mar 2017 13:36:53 +0000 (14:36 +0100)
commitf5fe727dd845e68fc65e1bc6fc098acdcb07098b
treef19f0c837d172b067bf43d7bf64aefa894a6bcc1
parent772e852a4228da4e60ed0390b1e1b47f718a6725
parent6dfb4a76fb7819e936acf65a1cbd18aa91b09f29
Merge branch 'master' into v1.1