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
..
2012-12-05 11:31:28 +01:00
2012-09-13 18:03:50 +04:00
2012-06-09 13:09:07 +00:00