Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/libxslt/default.nix Commit 1764ea2b0a introduced changes to libxslt in an awkward way to avoid re-builds on Linux. This patch has been simplified during this merge.		2013-03-25 13:43:45 +01:00
..
default.nix	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00