3 Commits

Author	SHA1	Message	Date
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
Charles Strahan	221509b0a6	ruby: refactoring, and package bundix	2015-01-20 01:07:55 -05:00
Charles Strahan	bf16d03075	ruby: support for proper bundler installs	2015-01-19 20:02:47 -05:00