osm.etsi.org Git - osm/RO.git/commit

author	garciadeblas <gerardo.garciadeblas@telefonica.com>
	Thu, 21 Sep 2017 16:12:58 +0000 (18:12 +0200)
committer	garciadeblas <gerardo.garciadeblas@telefonica.com>
	Thu, 21 Sep 2017 16:12:58 +0000 (18:12 +0200)
commit	a92a0eaaf370c626b442863f4127cd11fc64754c
tree	ea8710449092088d4ba7a29342a8a2b0b838eb20	tree \| snapshot
parent	862a60ae93454d1cb15feb25efa31f493e2f46d3	commit \| diff
parent	04f29113cb79e64c61c848216094e78f2cf29e6d	commit \| diff

Merge branch 'master' into vnffg

Change-Id: I13e763560a923aa47a1626cdd6ff37c0c31a3aa9
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>