Vladimír Čunát 87c3c0e885 Merge master into #2129 ...

Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix

2014-08-12 19:24:08 +02:00

12 KiB

Raw Blame History

View Raw