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-15 17:05:54 +02:00
2014-08-12 19:24:08 +02:00
2014-08-11 15:06:11 +02:00
2014-08-08 00:10:19 +02:00
2014-08-12 18:22:15 +02:00