Luca Bruno 033605e87f Merge branch 'nixos-subdir'
Conflicts:
	nixos/modules/system/boot/loader/grub/grub.nix
2015-06-13 15:18:12 +02:00
..
2015-06-13 15:18:12 +02:00
2015-06-13 15:18:12 +02:00
2014-12-04 12:03:10 +01:00