Vladimír Čunát 68430cf3d7 Merge branch master into x-updates ...

Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix

2013-11-16 20:32:44 +01:00

..

default.nix

Merge branch master into x-updates

2013-11-16 20:32:44 +01:00