Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master ... Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix		2018-03-15 22:30:56 +02:00
..
manual	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00