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

Conflicts: pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
parent f77abc8b7a 7491fccfe6
commit 7f410ef923
179 changed files with 2646 additions and 601 deletions
@@ -825,6 +825,7 @@ in
    systemd.services."user@".restartIfChanged = false;

    systemd.services.systemd-remount-fs.restartIfChanged = false;
+    systemd.services.systemd-journal-flush.restartIfChanged = false;

  };
 }