~ruther/guix-local: .gitmodules bad312e37dfe59cdc39a8e56f939cba5d24c4c2d

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.