obadz b74793bd1c Merge branch 'master' into staging
Conflicts:
	pkgs/tools/system/facter/default.nix
2016-08-29 12:44:17 +01:00
..
2016-08-27 23:54:54 +01:00
2016-08-24 22:41:41 +00:00
2016-08-23 18:50:47 +02:00
2016-08-28 12:20:59 +01:00
2016-08-23 18:50:06 +01:00
2016-08-29 12:44:17 +01:00
2016-08-23 18:50:06 +01:00
2016-08-24 11:57:44 +01:00