tree 53c166a7f515f15be711fa45e4654abed3db7642
parent 92503c388999a1f8a27a258b038ccd32c65e6a67
parent 5220d622adc336bd948b667a48523bdfe10fb073
author Jan Kundrát <jan.kundrat@cesnet.cz> 1519664880 +0100
committer Jan Kundrát <jan.kundrat@cesnet.cz> 1519664883 +0100

Merge branch 'master' into lumentum

Change-Id: I6032f6c6a0da254cf68ecce3e7cfa0c41638adcc