Vladimír Čunát 17ae1617dc Merge branch 'master' into x-updates ... Conflicts (systemd version is split on x-updates): pkgs/os-specific/linux/systemd/default.nix		2013-04-13 12:21:31 +02:00
..
darwin/native-x11-and-opengl	…
gnu	…
linux	Merge branch 'master' into x-updates	2013-04-13 12:21:31 +02:00
windows	…