Vladimír Čunát e51f73652d Merge recent master into staging ... Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)		2014-08-30 10:04:02 +02:00
..
builder.sh
common.nix
cve-2014-0475.patch
cve-2014-5119.patch
default.nix
dont-use-system-ld-so-cache.patch
dont-use-system-ld-so-preload.patch
fix-math.patch
fix_path_attribute_in_getconf.patch
glibc-crypt-blowfish.patch
info.nix
locales-builder.sh
locales.nix
multi.nix
nix-locale-archive.patch
rpcgen-path.patch