Eelco Dolstra 2c62a36b77 Merge remote-tracking branch 'origin/staging' into modular-stdenv ... Conflicts: pkgs/stdenv/generic/default.nix		2014-08-22 00:07:05 +02:00
..
csslint
nodejs	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00
remarkjs	remarkjs: Update from 0.6.4 to 0.6.5	2014-08-13 12:03:51 +02:00
twitter-bootstrap
xmlindent