Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby ... Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix		2015-01-20 20:21:03 -05:00
..
default.nix	Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby	2015-01-20 20:21:03 -05:00