Peter Simons 45e8de9a7d Merge branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/tools/misc/less/default.nix		2013-12-16 21:13:24 +01:00
doc
lib	Simplify crossLists	2013-12-12 14:01:48 -05:00
maintainers/scripts
nixos	Merge pull request #1373 from offlinehacker/nixos/memcached/user_fix	2013-12-14 22:55:00 -08:00
pkgs	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
.gitignore
.version
COPYING
default.nix