Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. ... Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix		2013-07-30 11:29:30 +02:00
doc	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
maintainers	Add nixpkgs-lint	2013-07-25 23:52:36 +02:00
pkgs	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
.gitignore
COPYING
default.nix
VERSION