Ludovic Courtès 4928e50033 Merge branch 'master' into core-updates ...

Conflicts:
	Makefile.am
	gnu/packages/base.scm

2013-03-29 21:44:31 +01:00

..

packages

Merge branch 'master' into core-updates

2013-03-29 21:44:31 +01:00

system

Add (gnu system vm).

2013-02-27 20:55:40 +01:00

packages.scm

store: Really disable file name canonicalization for derivation inputs.

2013-03-22 23:15:34 +01:00