Merge branch 'master' into staging

2016-05-12 04:53:38 +02:00
parent 81df035429 3d932ba135
commit 6c2fbfbd77
222 changed files with 17737 additions and 11667 deletions
@@ -40,6 +40,7 @@ let
      pkgs.time
      pkgs.texinfoInteractive
      pkgs.utillinux
+      pkgs.which # 88K size
    ];

 in