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-06-17 03:36:22 +00:00
2012-09-18 14:52:41 -04:00
2012-12-04 10:21:36 +04:00
2012-12-01 21:09:21 +01:00