Merge branch 'master' into core-updates Conflicts: gnu/packages/image.scm
gnu: Add weechat * gnu/packages/weechat.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Eric Bavier <bavier@member.fsf.org>