Peter Simons 6b1ebeccf2 Merge branch 'master' into stdenv-updates. ... There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix, which I resolved to the best of my knowledge. I'd appreciate if some of the ruby gurus could have a look at the outcome of my merge, though.		2013-06-11 12:11:25 +02:00
..
heimdal.nix	heimdal: cosmetic to make syntax highlightig happy	2013-06-06 10:48:58 +02:00
krb5.nix	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00