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
..
2014-04-22 14:05:09 +02:00
2014-05-20 13:09:41 +02:00
2014-04-19 14:41:21 +02:00