Ludovic Courtès 81eec00cb2 Merge branch 'master' into core-updates
Conflicts:
	Makefile.am
	guix/scripts/gc.scm
	guix/scripts/package.scm
	guix/ui.scm
	tests/guix-package.sh
2013-03-04 23:27:24 +01:00
..
2013-02-10 18:48:23 +01:00
2013-02-10 23:43:46 +01:00
2013-01-26 00:43:03 +01:00
2013-03-03 14:12:57 +01:00