Ludovic Courtès 829ecd002e Merge branch 'master' into core-updates ... Conflicts: gnu/packages/libwebsockets.scm		2014-02-27 23:49:30 +01:00
..
gnu-system.scm	Merge branch 'master' into core-updates	2014-02-27 23:49:30 +01:00
guix.scm	hydra: Add debugging for the Guix job set.	2014-01-18 14:41:58 +01:00