James Cook 3baf1c0772 Merge remote-tracking branch 'official/master' into ppp_2.4.7_squash ...

Conflicts:
	pkgs/tools/networking/ppp/default.nix

2015-02-10 09:24:38 -08:00

..

default.nix

Merge remote-tracking branch 'official/master' into ppp_2.4.7_squash

2015-02-10 09:24:38 -08:00

nix-purity.patch

ppp-2.4.5, a few patches

2012-01-04 15:10:27 +00:00

nonpriv.patch

ppp-2.4.5, a few patches

2012-01-04 15:10:27 +00:00