Eelco Dolstra 916793cf13 Merge branch 'master' into systemd-219 ... Conflicts: nixos/modules/system/boot/systemd.nix pkgs/applications/networking/p2p/transmission/default.nix pkgs/development/libraries/libseccomp/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/top-level/all-packages.nix		2015-09-07 21:28:33 +02:00
..
default.nix	Merge branch 'master' into systemd-219	2015-09-07 21:28:33 +02:00