Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
default.nix	python: 3.4.1 -> 3.4.2	2014-10-08 13:43:36 +02:00
setup-hook.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00