Merge branch 'cnfvar-dev'
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 5 Nov 2018 11:21:17 +0000 (12:21 +0100)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Mon, 5 Nov 2018 11:21:17 +0000 (12:21 +0100)
commitf37dc61326e2ec48527f4a731319aa8d72f72f2e
tree6100bb3d0e7493699a66ded72ce0407e465280af
parentea8faf9c551c94aa8f36f639a2939a952263a9f6
parent0bc34b4b6c60fdf3899460795d2e2109927e977e
Merge branch 'cnfvar-dev'