Tuomas Tynkkynen 4ff8f377af Merge remote-tracking branch 'upstream/master' into staging		2016-04-28 00:13:53 +03:00
..
activation	add get* helper functions and mass-replace manual outputs search with them	2016-04-25 13:24:39 +03:00
boot	Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into staging	2016-04-25 18:02:23 +03:00
etc	Update etc example to not use a real config file	2016-04-27 10:27:52 -05:00