Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates ... Conflicts: pkgs/development/compilers/gcc/4.7/default.nix Trivial solution.		2012-12-28 23:28:16 +01:00
..
mongodb	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
redis	Merge pull request #212 from washort/redis	2012-12-27 05:32:55 -08:00