obadz b74793bd1c Merge branch 'master' into staging ... Conflicts: pkgs/tools/system/facter/default.nix		2016-08-29 12:44:17 +01:00
..
alfred.nix	batman-adv: 2016.1 -> 2016.2	2016-07-11 04:04:49 +02:00
batctl.nix	batman-adv: 2016.1 -> 2016.2	2016-07-11 04:04:49 +02:00
default.nix	Merge branch 'master' into staging	2016-08-29 12:44:17 +01:00