From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri, 10 Mar 2017 13:36:53 +0000 (+0100)
Subject: Merge branch 'master' into v1.1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F1279%2F1;p=test.git

Merge branch 'master' into v1.1
---

f5fe727dd845e68fc65e1bc6fc098acdcb07098b