~ruther/guix-local: .gitmodules a7b6ffee68d7b47fe3f00a2a0bd8e5c83314f9ce

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.