Thomas Strobel 6366509e54 Merge branch 'upstream' into pam_mount ... Conflicts: pkgs/top-level/all-packages.nix		2014-09-15 12:15:11 +02:00
..
applications
build-support
data
desktops
development	Merge branch 'upstream' into pam_mount	2014-09-15 12:15:11 +02:00
games
misc
os-specific	Merge branch 'upstream' into pam_mount	2014-09-15 12:15:11 +02:00
servers
shells
stdenv
test
tools
top-level	Merge branch 'upstream' into pam_mount	2014-09-15 12:15:11 +02:00