Eelco Dolstra 01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219 ... Conflicts: pkgs/os-specific/linux/systemd/fixes.patch pkgs/os-specific/linux/upower/0.99.nix pkgs/top-level/all-packages.nix		2015-09-21 12:57:30 +02:00
..
default.nix	Merge remote-tracking branch 'origin/master' into systemd-219	2015-09-21 12:57:30 +02:00