nixpkgs/pkgs/development/interpreters/python/2.6
Vladimír Čunát e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
..
default.nix Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00
nix-store-mtime.patch
search-path.patch
setup-hook.sh