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-07-28 19:09:32 +02:00
2014-07-11 23:14:53 -04:00
2014-04-28 23:57:37 +02:00
2014-04-21 23:22:10 +02:00