Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
asdf
clwrapper
from-quicklisp
define-package.nix
lisp-packages.nix	stumpwm: removed from lisp-packages.	2014-10-05 16:42:32 +02:00