Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ... Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix		2014-09-02 12:31:03 +02:00
..
abstractions.xml
ad-hoc-network-config.xml
ad-hoc-packages.xml
adding-custom-packages.xml
config-file.xml
config-syntax.xml
configuration.xml
customizing-packages.xml
declarative-packages.xml
file-systems.xml
firewall.xml
ipv4-config.xml	Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6""	2014-08-31 09:46:16 -07:00
ipv6-config.xml
linux-kernel.xml
luks-file-systems.xml
modularity.xml
network-manager.xml
networking.xml
package-mgmt.xml
ssh.xml
summary.xml
user-mgmt.xml
wireless.xml
x-windows.xml