Thomas Strobel 6366509e54 Merge branch 'upstream' into pam_mount ... Conflicts: pkgs/top-level/all-packages.nix		2014-09-15 12:15:11 +02:00
..
darwin
gnu	gnu: Fix (evaluation of the) call to forceSystem.	2014-07-28 20:46:32 +02:00
linux	Merge branch 'upstream' into pam_mount	2014-09-15 12:15:11 +02:00
windows	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00