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
..
2014-07-30 16:19:26 +02:00
2014-02-08 14:59:52 +01:00
2018-02-13 01:24:24 +01:00
2014-07-30 16:19:26 +02:00