Charles Strahan 145733c479 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/redmine/default.nix
	pkgs/development/interpreters/ruby/gem.nix
	pkgs/development/interpreters/ruby/generated.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/tools/vagrant/default.nix
	pkgs/servers/consul/default.nix
2014-12-28 14:29:52 -05:00
..
2014-09-13 02:16:53 +02:00
2014-08-23 12:30:45 +04:00
2014-12-28 19:38:45 +01:00
2014-12-19 08:05:41 +02:00
2014-12-03 13:22:13 +01:00
2014-12-15 13:13:17 +01:00
2014-12-27 22:46:46 +01:00