~ruther/guix-local: .gitmodules fbbb1c0f4ca31ed2a13fe7362e441ccc04a8d08d

1e982451 — Ludovic Courtès 13 years ago

Merge branch 'nix-integration'

Conflicts:
	tests/guix-package.sh

e0538519 — Ludovic Courtès 13 years ago

build: Add Nix as a sub-module.

* .gitmodules, nix-upstream: New files.