nixpkgs/pkgs/applications/version-management/gource
Vladimír Čunát ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
..
default.nix Merge master into stdenv-updates 2014-01-20 19:39:28 +01:00