Merge remote-tracking branch 'origin/master' into staging

2014-07-07 13:16:26 +02:00
parent 421ce6439c 1ecae5c2c1
commit 95b828de42
224 changed files with 1831 additions and 665 deletions
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:

-with lib;
 with pkgs;
+with lib;

 let