Ludovic Courtès 01e354eb83 Merge branch 'core-updates'
Conflicts:
	guix/build/union.scm
2013-01-11 16:01:49 +01:00
..
2013-01-06 00:47:50 +01:00
2013-01-06 00:47:50 +01:00
2013-01-06 00:47:50 +01:00
2013-01-11 16:01:49 +01:00
2013-01-06 00:47:50 +01:00
2013-01-06 00:47:50 +01:00
2013-01-06 00:47:50 +01:00
2013-01-06 00:47:50 +01:00
2013-01-06 00:47:50 +01:00
2013-01-06 00:47:50 +01:00
2013-01-11 16:01:49 +01:00
2013-01-06 00:47:50 +01:00