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-22 14:54:22 +04:00
2012-08-05 23:10:49 +04:00
2010-07-28 15:35:01 +00:00