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
..
activation	Don't silently ignore errors from the activation script	2014-08-15 02:14:34 +02:00
boot	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
etc
upstart