Rickard Nilsson db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd ... Conflicts: pkgs/tools/networking/network-manager/default.nix		2013-01-03 13:44:47 +01:00
..
default.nix	Merge remote-tracking branch 'upstream/master' into systemd	2013-01-03 13:44:47 +01:00
nixos-purity.patch	networkmanager: Update to 0.9.4.0	2012-07-13 01:53:07 +02:00
pptp-purity.patch	NetworkManager-pptp: fix path to pppd and pptp, upgrade	2012-08-02 23:44:50 +04:00
pptp.nix	NetworkManager-pptp: fix path to pppd and pptp, upgrade	2012-08-02 23:44:50 +04:00