Thomas Tuegel 272cf5c44f Merge branch 'ibus'		2016-02-26 18:10:11 -06:00
..
config	Merge branch 'master' into staging	2016-02-07 13:52:42 +01:00
hardware	Merge branch 'master' into staging	2016-02-17 10:06:31 +01:00
i18n/inputMethod	ibus: rewrite NixOS module	2016-02-26 18:08:48 -06:00
installer	Merge branch 'master' into staging	2016-02-17 10:06:31 +01:00
misc	networkmanager: fix link-local ip addresses	2016-02-26 03:28:56 +01:00
profiles	qemu-guest.nix: Disable rngd	2016-02-23 11:56:09 +01:00
programs	ibus service: refactoring	2016-02-17 20:44:29 +09:00
security	Merge pull request #13434 from spacefrogg/oath-module	2016-02-26 18:06:28 +00:00
services	Merge pull request #13471 from Profpatsch/networkmanager-link-local	2016-02-27 02:55:31 +03:00
system	Merge pull request #10546 from aszlig/nixops-issue-350	2016-02-26 00:33:49 +00:00
tasks	Fix typo	2016-02-12 14:35:40 +01:00
testing	test-instrumentation.nix: Only clear $PAGER in the backdoor shell	2016-02-23 11:56:09 +01:00
virtualisation	ec2-data: ensure providing a SSH host key is actually optional	2016-02-25 20:11:49 -06:00
module-list.nix	config.security.oath: new module	2016-02-25 13:52:45 +00:00
rename.nix	gitlab: 8.0.5 -> 8.5.0, service improvements	2016-02-26 07:08:31 +01:00