Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/top-level/all-packages.nix		2013-10-26 18:28:05 +02:00
..
asdf	Updating ASDF to 3.0.2.4	2013-10-20 21:07:33 +04:00
clwrapper
stumpwm
define-package.nix
lisp-packages.nix