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
2014-07-30 16:19:26 +02:00
2015-05-04 14:18:14 +02:00
2015-01-06 16:39:00 +03:00
2014-02-08 14:59:52 +01:00
2014-07-30 16:19:26 +02:00