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
..
2013-03-21 19:53:29 +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
2013-03-06 20:52:04 +00:00