Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ...

Conflicts:
	pkgs/stdenv/generic/default.nix

2014-11-06 10:16:39 +01:00

..

catalog-in-library-vicinity.patch

…

default.nix

…

setup-hook.sh

…